From ec3e86f1d2f78bb9fece0956e246862cea3c07b9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 20 Nov 2019 22:55:44 -0500 Subject: [PATCH 01/13] Standardize Event Object to Object Event --- asm/macros/event.inc | 2 +- common_syms/field_control_avatar.txt | 2 +- data/layouts/layouts.json | 2 +- data/maps/AbandonedShip_Corridors_1F/map.json | 2 +- .../maps/AbandonedShip_Corridors_B1F/map.json | 2 +- data/maps/AbandonedShip_Deck/map.json | 2 +- .../map.json | 2 +- .../AbandonedShip_HiddenFloorRooms/map.json | 2 +- data/maps/AbandonedShip_Room_B1F/map.json | 2 +- data/maps/AbandonedShip_Rooms2_1F/map.json | 2 +- data/maps/AbandonedShip_Rooms2_B1F/map.json | 2 +- data/maps/AbandonedShip_Rooms_1F/map.json | 2 +- data/maps/AbandonedShip_Rooms_B1F/map.json | 2 +- data/maps/AbandonedShip_Underwater1/map.json | 2 +- data/maps/AbandonedShip_Underwater2/map.json | 2 +- data/maps/AlteringCave/map.json | 2 +- data/maps/AncientTomb/map.json | 2 +- data/maps/AquaHideout_1F/map.json | 2 +- data/maps/AquaHideout_B1F/map.json | 2 +- data/maps/AquaHideout_B2F/map.json | 2 +- data/maps/AquaHideout_UnusedRubyMap1/map.json | 2 +- data/maps/AquaHideout_UnusedRubyMap2/map.json | 2 +- data/maps/AquaHideout_UnusedRubyMap3/map.json | 2 +- data/maps/ArtisanCave_1F/map.json | 2 +- data/maps/ArtisanCave_B1F/map.json | 2 +- data/maps/BattleColosseum2P/map.json | 2 +- data/maps/BattleColosseum4P/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../BattleFrontier_BattleArenaLobby/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../BattleFrontier_BattleDomeLobby/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../BattleFrontier_BattlePalaceLobby/map.json | 2 +- .../map.json | 2 +- .../BattleFrontier_BattlePikeLobby/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../BattleFrontier_BattlePyramidTop/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../BattleFrontier_BattleTowerLobby/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- data/maps/BattleFrontier_Lounge1/map.json | 2 +- data/maps/BattleFrontier_Lounge2/map.json | 2 +- data/maps/BattleFrontier_Lounge3/map.json | 2 +- data/maps/BattleFrontier_Lounge4/map.json | 2 +- data/maps/BattleFrontier_Lounge5/map.json | 2 +- data/maps/BattleFrontier_Lounge6/map.json | 2 +- data/maps/BattleFrontier_Lounge7/map.json | 2 +- data/maps/BattleFrontier_Lounge8/map.json | 2 +- data/maps/BattleFrontier_Lounge9/map.json | 2 +- data/maps/BattleFrontier_Mart/map.json | 2 +- data/maps/BattleFrontier_OutsideEast/map.json | 2 +- data/maps/BattleFrontier_OutsideWest/map.json | 2 +- .../BattleFrontier_PokemonCenter_1F/map.json | 2 +- .../BattleFrontier_PokemonCenter_2F/map.json | 2 +- data/maps/BattleFrontier_RankingHall/map.json | 2 +- .../BattleFrontier_ReceptionGate/map.json | 2 +- data/maps/BattleFrontier_ScottsHouse/map.json | 2 +- data/maps/BattlePyramidSquare01/map.json | 2 +- data/maps/BattlePyramidSquare02/map.json | 2 +- data/maps/BattlePyramidSquare03/map.json | 2 +- data/maps/BattlePyramidSquare04/map.json | 2 +- data/maps/BattlePyramidSquare05/map.json | 2 +- data/maps/BattlePyramidSquare06/map.json | 2 +- data/maps/BattlePyramidSquare07/map.json | 2 +- data/maps/BattlePyramidSquare08/map.json | 2 +- data/maps/BattlePyramidSquare09/map.json | 2 +- data/maps/BattlePyramidSquare10/map.json | 2 +- data/maps/BattlePyramidSquare11/map.json | 2 +- data/maps/BattlePyramidSquare12/map.json | 2 +- data/maps/BattlePyramidSquare13/map.json | 2 +- data/maps/BattlePyramidSquare14/map.json | 2 +- data/maps/BattlePyramidSquare15/map.json | 2 +- data/maps/BattlePyramidSquare16/map.json | 2 +- data/maps/BirthIsland_Exterior/map.json | 2 +- data/maps/BirthIsland_Harbor/map.json | 2 +- data/maps/CaveOfOrigin_1F/map.json | 2 +- data/maps/CaveOfOrigin_B1F/map.json | 2 +- data/maps/CaveOfOrigin_Entrance/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- data/maps/ContestHall/map.json | 2 +- data/maps/ContestHall/scripts.inc | 2 +- data/maps/ContestHallBeauty/map.json | 2 +- data/maps/ContestHallCool/map.json | 2 +- data/maps/ContestHallCute/map.json | 2 +- data/maps/ContestHallSmart/map.json | 2 +- data/maps/ContestHallTough/map.json | 2 +- data/maps/DesertRuins/map.json | 2 +- data/maps/DesertUnderpass/map.json | 2 +- data/maps/DewfordTown/map.json | 2 +- data/maps/DewfordTown_Gym/map.json | 2 +- data/maps/DewfordTown_Hall/map.json | 2 +- data/maps/DewfordTown_House1/map.json | 2 +- data/maps/DewfordTown_House2/map.json | 2 +- .../DewfordTown_PokemonCenter_1F/map.json | 2 +- .../DewfordTown_PokemonCenter_2F/map.json | 2 +- data/maps/EverGrandeCity/map.json | 2 +- .../EverGrandeCity_ChampionsRoom/map.json | 2 +- data/maps/EverGrandeCity_DrakesRoom/map.json | 2 +- data/maps/EverGrandeCity_GlaciasRoom/map.json | 2 +- data/maps/EverGrandeCity_Hall1/map.json | 2 +- data/maps/EverGrandeCity_Hall2/map.json | 2 +- data/maps/EverGrandeCity_Hall3/map.json | 2 +- data/maps/EverGrandeCity_Hall4/map.json | 2 +- data/maps/EverGrandeCity_Hall5/map.json | 2 +- data/maps/EverGrandeCity_HallOfFame/map.json | 2 +- data/maps/EverGrandeCity_PhoebesRoom/map.json | 2 +- .../EverGrandeCity_PokemonCenter_1F/map.json | 2 +- .../EverGrandeCity_PokemonCenter_2F/map.json | 2 +- .../EverGrandeCity_PokemonLeague_1F/map.json | 2 +- .../EverGrandeCity_PokemonLeague_2F/map.json | 2 +- data/maps/EverGrandeCity_SidneysRoom/map.json | 2 +- data/maps/FallarborTown/map.json | 2 +- .../map.json | 2 +- .../FallarborTown_BattleTentCorridor/map.json | 2 +- .../FallarborTown_BattleTentLobby/map.json | 2 +- data/maps/FallarborTown_CozmosHouse/map.json | 2 +- data/maps/FallarborTown_Mart/map.json | 2 +- .../map.json | 2 +- .../FallarborTown_PokemonCenter_1F/map.json | 2 +- .../FallarborTown_PokemonCenter_2F/map.json | 2 +- data/maps/FarawayIsland_Entrance/map.json | 2 +- data/maps/FarawayIsland_Interior/map.json | 2 +- data/maps/FieryPath/map.json | 2 +- data/maps/FortreeCity/map.json | 2 +- data/maps/FortreeCity_DecorationShop/map.json | 2 +- data/maps/FortreeCity_Gym/map.json | 2 +- data/maps/FortreeCity_House1/map.json | 2 +- data/maps/FortreeCity_House2/map.json | 2 +- data/maps/FortreeCity_House3/map.json | 2 +- data/maps/FortreeCity_House4/map.json | 2 +- data/maps/FortreeCity_House5/map.json | 2 +- data/maps/FortreeCity_Mart/map.json | 2 +- .../FortreeCity_PokemonCenter_1F/map.json | 2 +- .../FortreeCity_PokemonCenter_2F/map.json | 2 +- data/maps/GraniteCave_1F/map.json | 2 +- data/maps/GraniteCave_B1F/map.json | 2 +- data/maps/GraniteCave_B2F/map.json | 2 +- data/maps/GraniteCave_StevensRoom/map.json | 2 +- data/maps/InsideOfTruck/map.json | 2 +- data/maps/IslandCave/map.json | 2 +- data/maps/JaggedPass/map.json | 2 +- data/maps/LavaridgeTown/map.json | 2 +- data/maps/LavaridgeTown_Gym_1F/map.json | 2 +- data/maps/LavaridgeTown_Gym_B1F/map.json | 2 +- data/maps/LavaridgeTown_HerbShop/map.json | 2 +- data/maps/LavaridgeTown_House/map.json | 2 +- data/maps/LavaridgeTown_Mart/map.json | 2 +- .../LavaridgeTown_PokemonCenter_1F/map.json | 2 +- .../LavaridgeTown_PokemonCenter_2F/map.json | 2 +- data/maps/LilycoveCity/map.json | 2 +- data/maps/LilycoveCity_ContestHall/map.json | 2 +- data/maps/LilycoveCity_ContestLobby/map.json | 2 +- .../LilycoveCity_CoveLilyMotel_1F/map.json | 2 +- .../LilycoveCity_CoveLilyMotel_2F/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../LilycoveCity_DepartmentStore_1F/map.json | 2 +- .../LilycoveCity_DepartmentStore_2F/map.json | 2 +- .../LilycoveCity_DepartmentStore_3F/map.json | 2 +- .../LilycoveCity_DepartmentStore_4F/map.json | 2 +- .../LilycoveCity_DepartmentStore_5F/map.json | 2 +- data/maps/LilycoveCity_Harbor/map.json | 2 +- data/maps/LilycoveCity_House1/map.json | 2 +- data/maps/LilycoveCity_House2/map.json | 2 +- data/maps/LilycoveCity_House3/map.json | 2 +- data/maps/LilycoveCity_House4/map.json | 2 +- .../LilycoveCity_LilycoveMuseum_1F/map.json | 2 +- .../LilycoveCity_LilycoveMuseum_2F/map.json | 2 +- .../LilycoveCity_MoveDeletersHouse/map.json | 2 +- .../LilycoveCity_PokemonCenter_1F/map.json | 2 +- .../LilycoveCity_PokemonCenter_2F/map.json | 2 +- .../map.json | 2 +- data/maps/LilycoveCity_UnusedMart/map.json | 2 +- .../LittlerootTown_BrendansHouse_1F/map.json | 2 +- .../LittlerootTown_BrendansHouse_2F/map.json | 2 +- .../maps/LittlerootTown_MaysHouse_1F/map.json | 2 +- .../maps/LittlerootTown_MaysHouse_2F/map.json | 2 +- .../map.json | 2 +- data/maps/MagmaHideout_1F/map.json | 2 +- data/maps/MagmaHideout_2F_1R/map.json | 2 +- data/maps/MagmaHideout_2F_2R/map.json | 2 +- data/maps/MagmaHideout_2F_3R/map.json | 2 +- data/maps/MagmaHideout_3F_1R/map.json | 2 +- data/maps/MagmaHideout_3F_2R/map.json | 2 +- data/maps/MagmaHideout_3F_3R/map.json | 2 +- data/maps/MagmaHideout_4F/map.json | 2 +- data/maps/MarineCave_End/map.json | 2 +- data/maps/MarineCave_Entrance/map.json | 2 +- data/maps/MauvilleCity/map.json | 2 +- data/maps/MauvilleCity_BikeShop/map.json | 2 +- data/maps/MauvilleCity_GameCorner/map.json | 2 +- data/maps/MauvilleCity_Gym/map.json | 2 +- data/maps/MauvilleCity_House1/map.json | 2 +- data/maps/MauvilleCity_House2/map.json | 2 +- data/maps/MauvilleCity_Mart/map.json | 2 +- .../MauvilleCity_PokemonCenter_1F/map.json | 2 +- .../MauvilleCity_PokemonCenter_2F/map.json | 2 +- data/maps/MeteorFalls_1F_1R/map.json | 2 +- data/maps/MeteorFalls_1F_2R/map.json | 2 +- data/maps/MeteorFalls_B1F_1R/map.json | 2 +- data/maps/MeteorFalls_B1F_2R/map.json | 2 +- data/maps/MeteorFalls_StevensCave/map.json | 2 +- data/maps/MirageTower_1F/map.json | 2 +- data/maps/MirageTower_2F/map.json | 2 +- data/maps/MirageTower_3F/map.json | 2 +- data/maps/MirageTower_4F/map.json | 2 +- .../maps/MossdeepCity_GameCorner_B1F/map.json | 2 +- data/maps/MossdeepCity_Gym/map.json | 2 +- data/maps/MossdeepCity_House1/map.json | 2 +- data/maps/MossdeepCity_House2/map.json | 2 +- data/maps/MossdeepCity_House3/map.json | 2 +- data/maps/MossdeepCity_House4/map.json | 2 +- data/maps/MossdeepCity_Mart/map.json | 2 +- .../MossdeepCity_PokemonCenter_1F/map.json | 2 +- .../MossdeepCity_PokemonCenter_2F/map.json | 2 +- .../maps/MossdeepCity_SpaceCenter_1F/map.json | 2 +- .../maps/MossdeepCity_SpaceCenter_2F/map.json | 2 +- data/maps/MossdeepCity_StevensHouse/map.json | 2 +- data/maps/MtChimney/map.json | 2 +- data/maps/MtChimney_CableCarStation/map.json | 2 +- data/maps/MtPyre_1F/map.json | 2 +- data/maps/MtPyre_2F/map.json | 2 +- data/maps/MtPyre_3F/map.json | 2 +- data/maps/MtPyre_4F/map.json | 2 +- data/maps/MtPyre_5F/map.json | 2 +- data/maps/MtPyre_6F/map.json | 2 +- data/maps/MtPyre_Exterior/map.json | 2 +- data/maps/MtPyre_Summit/map.json | 2 +- data/maps/NavelRock_B1F/map.json | 2 +- data/maps/NavelRock_Bottom/map.json | 2 +- data/maps/NavelRock_Down01/map.json | 2 +- data/maps/NavelRock_Down02/map.json | 2 +- data/maps/NavelRock_Down03/map.json | 2 +- data/maps/NavelRock_Down04/map.json | 2 +- data/maps/NavelRock_Down05/map.json | 2 +- data/maps/NavelRock_Down06/map.json | 2 +- data/maps/NavelRock_Down07/map.json | 2 +- data/maps/NavelRock_Down08/map.json | 2 +- data/maps/NavelRock_Down09/map.json | 2 +- data/maps/NavelRock_Down10/map.json | 2 +- data/maps/NavelRock_Down11/map.json | 2 +- data/maps/NavelRock_Entrance/map.json | 2 +- data/maps/NavelRock_Exterior/map.json | 2 +- data/maps/NavelRock_Fork/map.json | 2 +- data/maps/NavelRock_Harbor/map.json | 2 +- data/maps/NavelRock_Top/map.json | 2 +- data/maps/NavelRock_Up1/map.json | 2 +- data/maps/NavelRock_Up2/map.json | 2 +- data/maps/NavelRock_Up3/map.json | 2 +- data/maps/NavelRock_Up4/map.json | 2 +- data/maps/NewMauville_Entrance/map.json | 2 +- data/maps/NewMauville_Inside/map.json | 2 +- data/maps/OldaleTown_House1/map.json | 2 +- data/maps/OldaleTown_House2/map.json | 2 +- data/maps/OldaleTown_Mart/map.json | 2 +- .../maps/OldaleTown_PokemonCenter_1F/map.json | 2 +- .../maps/OldaleTown_PokemonCenter_2F/map.json | 2 +- data/maps/PacifidlogTown/map.json | 2 +- data/maps/PacifidlogTown_House1/map.json | 2 +- data/maps/PacifidlogTown_House2/map.json | 2 +- data/maps/PacifidlogTown_House3/map.json | 2 +- data/maps/PacifidlogTown_House4/map.json | 2 +- data/maps/PacifidlogTown_House5/map.json | 2 +- .../PacifidlogTown_PokemonCenter_1F/map.json | 2 +- .../PacifidlogTown_PokemonCenter_2F/map.json | 2 +- data/maps/PetalburgCity_Gym/map.json | 2 +- data/maps/PetalburgCity_House1/map.json | 2 +- data/maps/PetalburgCity_House2/map.json | 2 +- data/maps/PetalburgCity_Mart/map.json | 2 +- .../PetalburgCity_PokemonCenter_1F/map.json | 2 +- .../PetalburgCity_PokemonCenter_2F/map.json | 2 +- data/maps/PetalburgCity_WallysHouse/map.json | 2 +- data/maps/PetalburgWoods/map.json | 2 +- data/maps/RecordCorner/map.json | 2 +- data/maps/Route101/map.json | 2 +- data/maps/Route102/map.json | 2 +- data/maps/Route103/map.json | 2 +- data/maps/Route104_MrBrineysHouse/map.json | 2 +- .../Route104_PrettyPetalFlowerShop/map.json | 2 +- data/maps/Route104_Prototype/map.json | 2 +- .../map.json | 2 +- data/maps/Route105/map.json | 2 +- data/maps/Route106/map.json | 2 +- data/maps/Route107/map.json | 2 +- data/maps/Route108/map.json | 2 +- data/maps/Route109/map.json | 2 +- data/maps/Route109_SeashoreHouse/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../maps/Route110_TrickHouseCorridor/map.json | 2 +- data/maps/Route110_TrickHouseEnd/map.json | 2 +- .../maps/Route110_TrickHouseEntrance/map.json | 2 +- data/maps/Route110_TrickHousePuzzle1/map.json | 2 +- data/maps/Route110_TrickHousePuzzle2/map.json | 2 +- data/maps/Route110_TrickHousePuzzle3/map.json | 2 +- data/maps/Route110_TrickHousePuzzle4/map.json | 2 +- data/maps/Route110_TrickHousePuzzle5/map.json | 2 +- data/maps/Route110_TrickHousePuzzle6/map.json | 2 +- data/maps/Route110_TrickHousePuzzle7/map.json | 2 +- data/maps/Route110_TrickHousePuzzle8/map.json | 2 +- data/maps/Route111/map.json | 2 +- data/maps/Route111_OldLadysRestStop/map.json | 2 +- .../Route111_WinstrateFamilysHouse/map.json | 2 +- data/maps/Route112/map.json | 2 +- data/maps/Route112_CableCarStation/map.json | 2 +- data/maps/Route113/map.json | 2 +- data/maps/Route113_GlassWorkshop/map.json | 2 +- data/maps/Route114/map.json | 2 +- .../maps/Route114_FossilManiacsHouse/map.json | 2 +- .../Route114_FossilManiacsTunnel/map.json | 2 +- data/maps/Route114_LanettesHouse/map.json | 2 +- data/maps/Route115/map.json | 2 +- data/maps/Route116/map.json | 2 +- .../maps/Route116_TunnelersRestHouse/map.json | 2 +- data/maps/Route117/map.json | 2 +- data/maps/Route117_PokemonDayCare/map.json | 2 +- data/maps/Route118/map.json | 2 +- data/maps/Route119/map.json | 2 +- data/maps/Route119_House/map.json | 2 +- .../Route119_WeatherInstitute_1F/map.json | 2 +- .../Route119_WeatherInstitute_2F/map.json | 2 +- data/maps/Route120/map.json | 2 +- data/maps/Route121/map.json | 2 +- .../maps/Route121_SafariZoneEntrance/map.json | 2 +- data/maps/Route122/map.json | 2 +- data/maps/Route123/map.json | 2 +- data/maps/Route123_BerryMastersHouse/map.json | 2 +- data/maps/Route124/map.json | 2 +- .../map.json | 2 +- data/maps/Route125/map.json | 2 +- data/maps/Route126/map.json | 2 +- data/maps/Route127/map.json | 2 +- data/maps/Route128/map.json | 2 +- data/maps/Route129/map.json | 2 +- data/maps/Route130/map.json | 2 +- data/maps/Route131/map.json | 2 +- data/maps/Route132/map.json | 2 +- data/maps/Route133/map.json | 2 +- data/maps/Route134/map.json | 2 +- data/maps/RustboroCity_CuttersHouse/map.json | 2 +- data/maps/RustboroCity_DevonCorp_1F/map.json | 2 +- data/maps/RustboroCity_DevonCorp_2F/map.json | 2 +- data/maps/RustboroCity_DevonCorp_3F/map.json | 2 +- data/maps/RustboroCity_Flat1_1F/map.json | 2 +- data/maps/RustboroCity_Flat1_2F/map.json | 2 +- data/maps/RustboroCity_Flat2_1F/map.json | 2 +- data/maps/RustboroCity_Flat2_2F/map.json | 2 +- data/maps/RustboroCity_Flat2_3F/map.json | 2 +- data/maps/RustboroCity_Gym/map.json | 2 +- data/maps/RustboroCity_House1/map.json | 2 +- data/maps/RustboroCity_House2/map.json | 2 +- data/maps/RustboroCity_House3/map.json | 2 +- data/maps/RustboroCity_Mart/map.json | 2 +- .../RustboroCity_PokemonCenter_1F/map.json | 2 +- .../RustboroCity_PokemonCenter_2F/map.json | 2 +- data/maps/RustboroCity_PokemonSchool/map.json | 2 +- data/maps/RusturfTunnel/map.json | 2 +- data/maps/SSTidalCorridor/map.json | 2 +- data/maps/SSTidalLowerDeck/map.json | 2 +- data/maps/SSTidalRooms/map.json | 2 +- data/maps/SafariZone_North/map.json | 2 +- data/maps/SafariZone_Northeast/map.json | 2 +- data/maps/SafariZone_Northwest/map.json | 2 +- data/maps/SafariZone_RestHouse/map.json | 2 +- data/maps/SafariZone_South/map.json | 2 +- data/maps/SafariZone_Southeast/map.json | 2 +- data/maps/SafariZone_Southwest/map.json | 2 +- data/maps/ScorchedSlab/map.json | 2 +- data/maps/SeafloorCavern_Entrance/map.json | 2 +- data/maps/SeafloorCavern_Room1/map.json | 2 +- data/maps/SeafloorCavern_Room2/map.json | 2 +- data/maps/SeafloorCavern_Room3/map.json | 2 +- data/maps/SeafloorCavern_Room4/map.json | 2 +- data/maps/SeafloorCavern_Room5/map.json | 2 +- data/maps/SeafloorCavern_Room6/map.json | 2 +- data/maps/SeafloorCavern_Room7/map.json | 2 +- data/maps/SeafloorCavern_Room8/map.json | 2 +- data/maps/SeafloorCavern_Room9/map.json | 2 +- data/maps/SealedChamber_InnerRoom/map.json | 2 +- data/maps/SealedChamber_OuterRoom/map.json | 2 +- data/maps/SecretBase_BlueCave1/map.json | 2 +- data/maps/SecretBase_BlueCave2/map.json | 2 +- data/maps/SecretBase_BlueCave3/map.json | 2 +- data/maps/SecretBase_BlueCave4/map.json | 2 +- data/maps/SecretBase_BrownCave1/map.json | 2 +- data/maps/SecretBase_BrownCave2/map.json | 2 +- data/maps/SecretBase_BrownCave3/map.json | 2 +- data/maps/SecretBase_BrownCave4/map.json | 2 +- data/maps/SecretBase_RedCave1/map.json | 2 +- data/maps/SecretBase_RedCave2/map.json | 2 +- data/maps/SecretBase_RedCave3/map.json | 2 +- data/maps/SecretBase_RedCave4/map.json | 2 +- data/maps/SecretBase_Shrub1/map.json | 2 +- data/maps/SecretBase_Shrub2/map.json | 2 +- data/maps/SecretBase_Shrub3/map.json | 2 +- data/maps/SecretBase_Shrub4/map.json | 2 +- data/maps/SecretBase_Tree1/map.json | 2 +- data/maps/SecretBase_Tree2/map.json | 2 +- data/maps/SecretBase_Tree3/map.json | 2 +- data/maps/SecretBase_Tree4/map.json | 2 +- data/maps/SecretBase_YellowCave1/map.json | 2 +- data/maps/SecretBase_YellowCave2/map.json | 2 +- data/maps/SecretBase_YellowCave3/map.json | 2 +- data/maps/SecretBase_YellowCave4/map.json | 2 +- .../ShoalCave_HighTideEntranceRoom/map.json | 2 +- .../maps/ShoalCave_HighTideInnerRoom/map.json | 2 +- .../ShoalCave_LowTideEntranceRoom/map.json | 2 +- data/maps/ShoalCave_LowTideIceRoom/map.json | 2 +- data/maps/ShoalCave_LowTideInnerRoom/map.json | 2 +- data/maps/ShoalCave_LowTideLowerRoom/map.json | 2 +- .../maps/ShoalCave_LowTideStairsRoom/map.json | 2 +- data/maps/SkyPillar_1F/map.json | 2 +- data/maps/SkyPillar_2F/map.json | 2 +- data/maps/SkyPillar_3F/map.json | 2 +- data/maps/SkyPillar_4F/map.json | 2 +- data/maps/SkyPillar_5F/map.json | 2 +- data/maps/SkyPillar_Entrance/map.json | 2 +- data/maps/SkyPillar_Outside/map.json | 2 +- data/maps/SkyPillar_Top/map.json | 2 +- data/maps/SlateportCity/map.json | 2 +- .../map.json | 2 +- .../SlateportCity_BattleTentCorridor/map.json | 2 +- .../SlateportCity_BattleTentLobby/map.json | 2 +- data/maps/SlateportCity_Harbor/map.json | 2 +- data/maps/SlateportCity_House/map.json | 2 +- data/maps/SlateportCity_Mart/map.json | 2 +- .../SlateportCity_NameRatersHouse/map.json | 2 +- .../SlateportCity_OceanicMuseum_1F/map.json | 2 +- .../SlateportCity_OceanicMuseum_2F/map.json | 2 +- .../SlateportCity_PokemonCenter_1F/map.json | 2 +- .../SlateportCity_PokemonCenter_2F/map.json | 2 +- .../SlateportCity_PokemonFanClub/map.json | 2 +- .../SlateportCity_SternsShipyard_1F/map.json | 2 +- .../SlateportCity_SternsShipyard_2F/map.json | 2 +- data/maps/SootopolisCity/map.json | 2 +- data/maps/SootopolisCity_Gym_1F/map.json | 2 +- data/maps/SootopolisCity_Gym_B1F/map.json | 2 +- data/maps/SootopolisCity_House1/map.json | 2 +- data/maps/SootopolisCity_House2/map.json | 2 +- data/maps/SootopolisCity_House3/map.json | 2 +- data/maps/SootopolisCity_House4/map.json | 2 +- data/maps/SootopolisCity_House5/map.json | 2 +- data/maps/SootopolisCity_House6/map.json | 2 +- data/maps/SootopolisCity_House7/map.json | 2 +- .../map.json | 2 +- data/maps/SootopolisCity_Mart/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../SootopolisCity_PokemonCenter_1F/map.json | 2 +- .../SootopolisCity_PokemonCenter_2F/map.json | 2 +- data/maps/SouthernIsland_Exterior/map.json | 2 +- data/maps/SouthernIsland_Interior/map.json | 2 +- data/maps/TerraCave_End/map.json | 2 +- data/maps/TerraCave_Entrance/map.json | 2 +- data/maps/TradeCenter/map.json | 2 +- data/maps/TrainerHill_1F/map.json | 2 +- data/maps/TrainerHill_2F/map.json | 2 +- data/maps/TrainerHill_3F/map.json | 2 +- data/maps/TrainerHill_4F/map.json | 2 +- data/maps/TrainerHill_Elevator/map.json | 2 +- data/maps/TrainerHill_Entrance/map.json | 2 +- data/maps/TrainerHill_Roof/map.json | 2 +- data/maps/Underwater1/map.json | 2 +- data/maps/Underwater2/map.json | 2 +- data/maps/Underwater3/map.json | 2 +- data/maps/Underwater4/map.json | 2 +- data/maps/Underwater5/map.json | 2 +- data/maps/Underwater6/map.json | 2 +- data/maps/Underwater7/map.json | 2 +- data/maps/Underwater_MarineCave/map.json | 2 +- data/maps/Underwater_Route134/map.json | 2 +- data/maps/Underwater_SeafloorCavern/map.json | 2 +- data/maps/Underwater_SealedChamber/map.json | 2 +- data/maps/Underwater_SootopolisCity/map.json | 2 +- data/maps/UnionRoom/map.json | 2 +- .../UnknownLinkContestRoom_25_29/map.json | 2 +- .../UnknownLinkContestRoom_25_30/map.json | 2 +- .../UnknownLinkContestRoom_25_31/map.json | 2 +- .../UnknownLinkContestRoom_25_32/map.json | 2 +- .../UnknownLinkContestRoom_25_33/map.json | 2 +- .../UnknownLinkContestRoom_25_34/map.json | 2 +- data/maps/VerdanturfTown/map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../VerdanturfTown_BattleTentLobby/map.json | 2 +- .../map.json | 2 +- data/maps/VerdanturfTown_House/map.json | 2 +- data/maps/VerdanturfTown_Mart/map.json | 2 +- .../VerdanturfTown_PokemonCenter_1F/map.json | 2 +- .../VerdanturfTown_PokemonCenter_2F/map.json | 2 +- data/maps/VerdanturfTown_WandasHouse/map.json | 2 +- data/maps/VictoryRoad_1F/map.json | 2 +- data/maps/VictoryRoad_B1F/map.json | 2 +- data/maps/VictoryRoad_B2F/map.json | 2 +- data/maps/map_groups.json | 2 +- data/scripts/berry_blender.inc | 2 +- data/scripts/berry_tree.inc | 32 +- data/scripts/contest_hall.inc | 2 +- data/scripts/gabby_and_ty.inc | 4 +- data/specials.inc | 20 +- include/battle_pyramid.h | 6 +- include/berry.h | 10 +- include/constants/coins.h | 2 +- include/constants/vars.h | 2 +- include/event_data.h | 2 +- include/event_obj_lock.h | 6 +- include/event_object_movement.h | 408 +- include/faraway_island.h | 4 +- include/field_control_avatar.h | 2 +- include/field_effect_helpers.h | 8 +- include/field_player_avatar.h | 2 +- include/global.fieldmap.h | 16 +- include/global.h | 4 +- include/load_save.h | 4 +- include/overworld.h | 8 +- include/script.h | 2 +- include/script_movement.h | 2 +- include/trainer_hill.h | 6 +- include/trainer_see.h | 8 +- src/apprentice.c | 2 +- src/battle_pike.c | 6 +- src/battle_pyramid.c | 104 +- src/battle_setup.c | 52 +- src/battle_tower.c | 10 +- src/battle_transition.c | 2 +- src/berry.c | 46 +- src/bike.c | 54 +- src/cable_car.c | 6 +- .../base_oam.h | 16 +- .../event_object/berry_tree_graphics_tables.h | 565 +++ src/data/event_object/event_object_anims.h | 1171 +++++ .../event_object_graphics.h | 578 +-- .../event_object/event_object_graphics_info.h | 245 + .../event_object_graphics_info_pointers.h | 499 ++ .../event_object/event_object_pic_tables.h | 2174 ++++++++ .../event_object_subsprites.h | 166 +- .../field_effect_object_template_pointers.h | 0 .../field_effect_objects.h | 76 +- .../movement_action_func_tables.h | 1160 ++--- .../movement_type_func_tables.h | 104 +- .../berry_tree_graphics_tables.h | 565 --- src/data/field_event_obj/event_object_anims.h | 1171 ----- .../event_object_graphics_info.h | 245 - .../event_object_graphics_info_pointers.h | 499 -- .../field_event_obj/event_object_pic_tables.h | 2174 -------- src/data/trade.h | 2 +- src/data/wild_encounters.json | 2 +- src/decoration.c | 54 +- src/easy_chat.c | 4 +- src/event_data.c | 2 +- src/event_obj_lock.c | 66 +- src/event_object_movement.c | 4358 ++++++++--------- src/faraway_island.c | 76 +- src/field_camera.c | 6 +- src/field_control_avatar.c | 48 +- src/field_effect.c | 432 +- src/field_effect_helpers.c | 322 +- src/field_player_avatar.c | 392 +- src/field_screen_effect.c | 62 +- src/field_special_scene.c | 4 +- src/field_specials.c | 46 +- src/fldeff_cut.c | 2 +- src/fldeff_misc.c | 20 +- src/fldeff_rocksmash.c | 22 +- src/frontier_util.c | 6 +- src/item_menu.c | 2 +- src/item_use.c | 20 +- src/load_save.c | 12 +- src/match_call.c | 10 +- src/mevent_client.c | 2 +- src/mirage_tower.c | 18 +- src/naming_screen.c | 4 +- src/overworld.c | 296 +- src/rotating_tile_puzzle.c | 80 +- src/scrcmd.c | 50 +- src/script.c | 2 +- src/script_movement.c | 74 +- src/script_pokemon_util_80F87D8.c | 22 +- src/secret_base.c | 32 +- src/shop.c | 34 +- src/start_menu.c | 10 +- src/trainer_hill.c | 18 +- src/trainer_see.c | 222 +- src/tv.c | 4 +- src/union_room.c | 2 +- src/union_room_player_avatar.c | 38 +- tools/mapjson/mapjson.cpp | 2 +- 606 files changed, 10080 insertions(+), 10080 deletions(-) rename src/data/{field_event_obj => event_object}/base_oam.h (63%) create mode 100755 src/data/event_object/berry_tree_graphics_tables.h create mode 100755 src/data/event_object/event_object_anims.h rename src/data/{field_event_obj => event_object}/event_object_graphics.h (51%) create mode 100755 src/data/event_object/event_object_graphics_info.h create mode 100755 src/data/event_object/event_object_graphics_info_pointers.h create mode 100755 src/data/event_object/event_object_pic_tables.h rename src/data/{field_event_obj => event_object}/event_object_subsprites.h (53%) rename src/data/{field_event_obj => event_object}/field_effect_object_template_pointers.h (100%) rename src/data/{field_event_obj => event_object}/field_effect_objects.h (93%) rename src/data/{field_event_obj => event_object}/movement_action_func_tables.h (50%) rename src/data/{field_event_obj => event_object}/movement_type_func_tables.h (80%) delete mode 100755 src/data/field_event_obj/berry_tree_graphics_tables.h delete mode 100755 src/data/field_event_obj/event_object_anims.h delete mode 100755 src/data/field_event_obj/event_object_graphics_info.h delete mode 100755 src/data/field_event_obj/event_object_graphics_info_pointers.h delete mode 100755 src/data/field_event_obj/event_object_pic_tables.h diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 9db57daf1d..cef18bc8d2 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -765,7 +765,7 @@ .2byte \y .endm - @ Copies a live event object's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen. + @ Copies a live object event's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen. .macro copyobjectxytoperm index:req .byte 0x64 .2byte \index diff --git a/common_syms/field_control_avatar.txt b/common_syms/field_control_avatar.txt index 0f336a407d..268f60c641 100644 --- a/common_syms/field_control_avatar.txt +++ b/common_syms/field_control_avatar.txt @@ -1 +1 @@ -gSelectedEventObject +gSelectedObjectEvent diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index bfa2aa8115..1384b2e2ea 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -4412,4 +4412,4 @@ "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin" } ] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index b75fcf3acd..60d8481ad0 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -129,4 +129,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 04868ad92e..986ed6d4eb 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -110,4 +110,4 @@ "script": "AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor" } ] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index b12ff40575..8e8529716a 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -53,4 +53,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 81e19fd1fd..87d802c596 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -93,4 +93,4 @@ "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door" } ] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index f937eb649f..3f81080f18 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -215,4 +215,4 @@ "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" } ] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index b8e2a71da4..e5b88f7b69 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 6f39d4827d..a24e2947aa 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 672d2c54ec..be7dd5cddd 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 28feaf9403..0c325b4b72 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -113,4 +113,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 0af0a05ac9..b8ccd9ee42 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index de9c778159..e333a9e9fb 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index c1c9f24d36..85a060efe8 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json index 848eb95c19..0c28b77b8c 100644 --- a/data/maps/AlteringCave/map.json +++ b/data/maps/AlteringCave/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 9229f7581c..fefcaaa98c 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -78,4 +78,4 @@ "script": "AncientTomb_EventScript_CaveEntranceSide" } ] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 25fe48a9ed..d873d332dd 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index f31180f8bd..3eff8d6fbf 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -311,4 +311,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index 1ae0fcecd3..af4602595e 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -186,4 +186,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json index 22b6454134..ac21b7f2d9 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json index 5bee651589..26dde7f5ba 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json index 03cafd7dc0..26ed361ae5 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json index dc7792d8a4..8f238a042c 100644 --- a/data/maps/ArtisanCave_1F/map.json +++ b/data/maps/ArtisanCave_1F/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json index 2fec826cdc..138ad35fed 100644 --- a/data/maps/ArtisanCave_B1F/map.json +++ b/data/maps/ArtisanCave_B1F/map.json @@ -79,4 +79,4 @@ "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleColosseum2P/map.json b/data/maps/BattleColosseum2P/map.json index 18df18491a..04c2da1ecf 100644 --- a/data/maps/BattleColosseum2P/map.json +++ b/data/maps/BattleColosseum2P/map.json @@ -65,4 +65,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleColosseum4P/map.json b/data/maps/BattleColosseum4P/map.json index d17851aaf3..0f6cc8fbec 100644 --- a/data/maps/BattleColosseum4P/map.json +++ b/data/maps/BattleColosseum4P/map.json @@ -83,4 +83,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json index 6299e7b11c..9bb2784963 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -135,4 +135,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json index 02f3cd0194..18bca93664 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/map.json +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json index 49712c5dd8..be03b2704f 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.json +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -108,4 +108,4 @@ "script": "BattleFrontier_BattleArenaLobby_EventScript_2560CA" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json index e3a6c915b8..65428e6233 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json @@ -213,4 +213,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json index 6e7f2c3f5d..afd83f7e54 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.json +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json index 89eeb60e46..66bc381a3a 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.json +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -144,4 +144,4 @@ "script": "BattleFrontier_BattleDomeLobby_EventScript_249E34" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json index 293a9cc225..2766f023ea 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json index 5f45fa7acb..215165ec6d 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json @@ -122,4 +122,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json index 8ed837413f..43599f9d48 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/map.json +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json @@ -136,4 +136,4 @@ "script": "BattleFrontier_BattleFactoryLobby_EventScript_258839" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json index fd20b7180c..c532df91f0 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json index cfa4cf97ff..06cb5452e2 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json index 9d635efc78..51e1200a39 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json @@ -138,4 +138,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json index c1d79ee509..cd22af8260 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/map.json +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -143,4 +143,4 @@ "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DCA6" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json index 98b061e9fe..11bab3e77d 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json index 5854c6bf7a..656686bcf0 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.json +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -109,4 +109,4 @@ "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAC6" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json index 630a0e3354..c50612631c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json @@ -108,4 +108,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json index a07464a15d..bf2b05e94c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json index 6e0e749605..a2a00a3a9c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json @@ -81,4 +81,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index ac9230c533..d6fa8acd48 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -126,4 +126,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json index 3f4739b26b..606367cbab 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -226,4 +226,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json index 4f99b94881..69ceef7980 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -95,4 +95,4 @@ "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index d73dc16923..25104660ed 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -54,4 +54,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json index c8efe3399c..193eec7245 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json index 698edcc65b..53717b450b 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json @@ -96,4 +96,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json index 5081edd82d..6961d2ba5d 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json index de898bef45..bf5f7c8f2a 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json @@ -70,4 +70,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json index f4cbd3590c..4df8652e7d 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.json +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index d758b365b0..b7cf2d9e7e 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -198,4 +198,4 @@ "script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json index f3b0807320..1e461f09f9 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -135,4 +135,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json index 055b6e56e5..c4400bfffe 100644 --- a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json +++ b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json @@ -157,4 +157,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json index d631907761..a33406ffc6 100644 --- a/data/maps/BattleFrontier_Lounge1/map.json +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json index 575f2898ee..64e4e80d3c 100644 --- a/data/maps/BattleFrontier_Lounge2/map.json +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json index 843fc6e109..68f862a903 100644 --- a/data/maps/BattleFrontier_Lounge3/map.json +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json index 0c86ccf3c8..21b6517f0f 100644 --- a/data/maps/BattleFrontier_Lounge4/map.json +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json index 6d9eab35fe..a403e8fc58 100644 --- a/data/maps/BattleFrontier_Lounge5/map.json +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json index 5888ea7c05..a0d53ac562 100644 --- a/data/maps/BattleFrontier_Lounge6/map.json +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json index 5ebc789baa..349707d5a9 100644 --- a/data/maps/BattleFrontier_Lounge7/map.json +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json index 519f008fcf..bd5feaf387 100644 --- a/data/maps/BattleFrontier_Lounge8/map.json +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json index 9f0a56ba01..7d55c46588 100644 --- a/data/maps/BattleFrontier_Lounge9/map.json +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index f4adf6c367..f42d5e24b8 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index cccf8fb8a4..87cf27b70b 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -526,4 +526,4 @@ "script": "Common_EventScript_ShowPokemonCenterSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index 42b76323a5..991b29ba95 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -455,4 +455,4 @@ "script": "Common_EventScript_ShowPokemartSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index 743bab8b00..8c79311ee8 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index fa93cde5f9..4175b037ee 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json index f26e03e416..58c15fc0ab 100644 --- a/data/maps/BattleFrontier_RankingHall/map.json +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -169,4 +169,4 @@ "script": "BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index ff891ad5bb..699eb4b0e7 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json index 13cb13dd47..552d555085 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.json +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json index d4cbfd71d9..002671d4a5 100644 --- a/data/maps/BattlePyramidSquare01/map.json +++ b/data/maps/BattlePyramidSquare01/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json index e68b71284f..8d5704b7ea 100644 --- a/data/maps/BattlePyramidSquare02/map.json +++ b/data/maps/BattlePyramidSquare02/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json index 8a495158e7..ebf439db25 100644 --- a/data/maps/BattlePyramidSquare03/map.json +++ b/data/maps/BattlePyramidSquare03/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json index e413a7e5fc..a051f94947 100644 --- a/data/maps/BattlePyramidSquare04/map.json +++ b/data/maps/BattlePyramidSquare04/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json index d16a87646e..b7127dc195 100644 --- a/data/maps/BattlePyramidSquare05/map.json +++ b/data/maps/BattlePyramidSquare05/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json index ddf011814a..70352aec3c 100644 --- a/data/maps/BattlePyramidSquare06/map.json +++ b/data/maps/BattlePyramidSquare06/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json index 8719c6d25c..afcddbb5e5 100644 --- a/data/maps/BattlePyramidSquare07/map.json +++ b/data/maps/BattlePyramidSquare07/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json index 54cfa4fe80..78cb972ecf 100644 --- a/data/maps/BattlePyramidSquare08/map.json +++ b/data/maps/BattlePyramidSquare08/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json index 67b9ceb1fe..09c06273e6 100644 --- a/data/maps/BattlePyramidSquare09/map.json +++ b/data/maps/BattlePyramidSquare09/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json index 0a5e88bf7f..3a90be443c 100644 --- a/data/maps/BattlePyramidSquare10/map.json +++ b/data/maps/BattlePyramidSquare10/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json index 5dc7736a3a..373b02b6ee 100644 --- a/data/maps/BattlePyramidSquare11/map.json +++ b/data/maps/BattlePyramidSquare11/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json index dcb57812d9..fd5015559d 100644 --- a/data/maps/BattlePyramidSquare12/map.json +++ b/data/maps/BattlePyramidSquare12/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index d277c5b1bc..c950579ed0 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json index 5727356edb..73815cdf15 100644 --- a/data/maps/BattlePyramidSquare14/map.json +++ b/data/maps/BattlePyramidSquare14/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json index 62c7e34f33..6443401c32 100644 --- a/data/maps/BattlePyramidSquare15/map.json +++ b/data/maps/BattlePyramidSquare15/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index a69a0ed5a3..c1c060aac3 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 50bd57f0b7..bd354987a0 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index ea124d9efb..4848c8b223 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index 989b1cf305..91f2b7ccd1 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index 61d8dc715d..abde3377cf 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 07c7af816d..2dea419988 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json index e131e4f0c7..effba642d9 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json index 8b83029e3a..62dc60a8e2 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json index 2b7c6db194..7127dfc195 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ContestHall/map.json b/data/maps/ContestHall/map.json index 1402a9afa0..b8dcf0c420 100644 --- a/data/maps/ContestHall/map.json +++ b/data/maps/ContestHall/map.json @@ -213,4 +213,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc index e1ef9b7084..a5fd02d937 100644 --- a/data/maps/ContestHall/scripts.inc +++ b/data/maps/ContestHall/scripts.inc @@ -79,7 +79,7 @@ ContestHall_EventScript_SetContestObjects:: @ 823B834 call ContestHall_EventScript_CreateAudience end -@ There are 8 audience member event objects, 7 of which are given random gfx below (the 8th is the Artist) +@ There are 8 audience member object events, 7 of which are given random gfx below (the 8th is the Artist) @ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842 call ContestHall_EventScript_GetRandomAudienceGfxId diff --git a/data/maps/ContestHallBeauty/map.json b/data/maps/ContestHallBeauty/map.json index daad0f9626..a521bb6afb 100644 --- a/data/maps/ContestHallBeauty/map.json +++ b/data/maps/ContestHallBeauty/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/ContestHallCool/map.json b/data/maps/ContestHallCool/map.json index d1c2e985c2..4e9678ec67 100644 --- a/data/maps/ContestHallCool/map.json +++ b/data/maps/ContestHallCool/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/ContestHallCute/map.json b/data/maps/ContestHallCute/map.json index d6b16dc4ef..0bde219488 100644 --- a/data/maps/ContestHallCute/map.json +++ b/data/maps/ContestHallCute/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/ContestHallSmart/map.json b/data/maps/ContestHallSmart/map.json index 12d3cccd8a..4f5e6f4076 100644 --- a/data/maps/ContestHallSmart/map.json +++ b/data/maps/ContestHallSmart/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/ContestHallTough/map.json b/data/maps/ContestHallTough/map.json index 0702111732..1142738da7 100644 --- a/data/maps/ContestHallTough/map.json +++ b/data/maps/ContestHallTough/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 441157d861..54f5e1663d 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -78,4 +78,4 @@ "script": "DesertRuins_EventScript_CaveEntranceSide" } ] -} \ No newline at end of file +} diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index a3a80d41ed..634fbcc069 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index bfa5a2e8bb..739eac766c 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -171,4 +171,4 @@ "script": "DewfordTown_EventScript_HallSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index 35ba61064b..e3e3cb9489 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -170,4 +170,4 @@ "script": "DewfordTown_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index 087981fdef..2271696cb7 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -167,4 +167,4 @@ "script": "DewfordTown_Hall_EventScript_Painting" } ] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index beb6d52759..898cecb1ef 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index ac1abca367..fa54854499 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 67e0e57219..30b94e5547 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 6ebca2ae0c..7d45123e9a 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 0fd6e9eca5..2758236ece 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -193,4 +193,4 @@ "script": "Common_EventScript_ShowPokemonCenterSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 4819c3b894..1cfe9d16c8 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 5ff9107909..21388e4626 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 8d220202e4..49de0534da 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json index 1ebb9c9251..862ccf4bbe 100644 --- a/data/maps/EverGrandeCity_Hall1/map.json +++ b/data/maps/EverGrandeCity_Hall1/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json index 0631c14f0f..06403ed9cd 100644 --- a/data/maps/EverGrandeCity_Hall2/map.json +++ b/data/maps/EverGrandeCity_Hall2/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json index f181843bf6..4c4ebfca55 100644 --- a/data/maps/EverGrandeCity_Hall3/map.json +++ b/data/maps/EverGrandeCity_Hall3/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json index b2c095e77f..297170f8fe 100644 --- a/data/maps/EverGrandeCity_Hall4/map.json +++ b/data/maps/EverGrandeCity_Hall4/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json index 04597cf656..4d67b6b3ee 100644 --- a/data/maps/EverGrandeCity_Hall5/map.json +++ b/data/maps/EverGrandeCity_Hall5/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index d0588f76a9..387ded6e1e 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 73ee3357d1..7e15516d96 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 23bbe085f2..da17bd1979 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index b995908296..81a0388279 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index 8efb63b9a2..7a70ef9682 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -106,4 +106,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index a016be34be..edaf0124ee 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 0aa57a944b..86ebc8211a 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index b0475451ae..b394b13e4d 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -182,4 +182,4 @@ "flag": "FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET" } ] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json index da4c9fd4f4..93b8f97e0c 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/map.json +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -57,4 +57,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json index 60168264f3..abcfa98f97 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/map.json +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index 4c565ff8ca..26eff92e0c 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -107,4 +107,4 @@ "script": "FallarborTown_BattleTentLobby_EventScript_20024F" } ] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_CozmosHouse/map.json b/data/maps/FallarborTown_CozmosHouse/map.json index a31c1c5bfa..3a56d2dc29 100644 --- a/data/maps/FallarborTown_CozmosHouse/map.json +++ b/data/maps/FallarborTown_CozmosHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index f58c0d9e2f..f90ce102c4 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json index c444c1e382..af97d2b024 100644 --- a/data/maps/FallarborTown_MoveRelearnersHouse/map.json +++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index 0b55de01a9..e841014693 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 60bca57a90..a65da7770a 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index fe81fd10a7..c8f4835968 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -96,4 +96,4 @@ "script": "FarawayIsland_Entrance_EventScript_Sign" } ] -} \ No newline at end of file +} diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index 4998380e1a..47be4d5df6 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 70d1a2cfdb..0858d14706 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index ce1dcee3e1..20b5b12d4b 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -233,4 +233,4 @@ "script": "Common_EventScript_ShowPokemartSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index ac0ca1f89d..676081aa35 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index 7b17c58c0c..e5483d9445 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -154,4 +154,4 @@ "script": "FortreeCity_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index f984e2be56..c67a599e72 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index c4988e863a..ca3d48ff67 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index ce70f46054..923b8ee396 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 01d1a99e8e..b3bdea382f 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index a53b4e35c9..52805ad532 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index a8bca3743f..29ba47cb5c 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index 38f133cc0a..1d85a0a800 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 42aca81648..c0b6d1f183 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index 1822dd0c94..667e390e40 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 5a45481645..f67dbac6bf 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -81,4 +81,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 72e4030465..60914f2249 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -188,4 +188,4 @@ "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2" } ] -} \ No newline at end of file +} diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 87264cd544..8d9a7b4d9e 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 256c7c1a59..2dad355ec6 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -148,4 +148,4 @@ "script": "InsideOfTruck_EventScript_MovingBox" } ] -} \ No newline at end of file +} diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index dbecdf4ed9..e6cb5856b2 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -78,4 +78,4 @@ "script": "IslandCave_EventScript_CaveEntranceSide" } ] -} \ No newline at end of file +} diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index ea13d94c2e..ddb8b8f371 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -243,4 +243,4 @@ "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL" } ] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 1212f3354f..7c0303036c 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -259,4 +259,4 @@ "flag": "FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL" } ] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 51665cdeb3..99f2c33ffe 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -296,4 +296,4 @@ "script": "LavaridgeTown_Gym_1F_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 7b03d4f533..8e3ae0260e 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -239,4 +239,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 1e7048b3f7..905c9aaba8 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 77ebb268e9..04d735f8d0 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index d55b562dbf..ca2630ebaa 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 4df734a49d..0522494a23 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -99,4 +99,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index 2ee196f9ba..bc345bddda 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 4f7c3ab0f7..ca20cb74a1 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -519,4 +519,4 @@ "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 456c7eec81..38a9bfd41c 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -512,4 +512,4 @@ "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 744ed41742..b2795ff3cf 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -469,4 +469,4 @@ "script": "LilycoveCity_ContestLobby_EventScript_LinkContestResults" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index c447bb41d9..6260eac154 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -63,4 +63,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 17c93e5a1a..b73679a44b 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -117,4 +117,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index abc4e18dde..572e018745 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 44f54006c9..91a94af6d2 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -95,4 +95,4 @@ "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 0fc05dd5a5..8857d3bd1b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -134,4 +134,4 @@ "script": "LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index fd30dc5164..c179d1fd51 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index cf25e1798f..850b0175bb 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index a95cf6c3e4..106d10327f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 98d15787ed..fe82bd3a0f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -131,4 +131,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 1b97c298d7..d402e1517f 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index 4f3fbcc28f..51951bd01c 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index c92a504991..359206ad08 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index e8010956d9..f10334edce 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 95fc79d35e..61dcd58f80 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 83028fbeb4..54cf821c9d 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -299,4 +299,4 @@ "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index 54d6fbc639..f486507a46 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -175,4 +175,4 @@ "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index 30c5a413f9..ede184d570 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 4f87f50b0a..0ad98c8d24 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index cd1324cbe4..a2fb65a398 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index f918c86ecd..93a8159f9c 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -150,4 +150,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index 44cd20815a..afa6c739cc 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 8b0c762f94..9536daa09f 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -168,4 +168,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 01af64e7d3..7ea29e671b 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -267,4 +267,4 @@ "script": "PlayersHouse_2F_EventScript_GameCube" } ] -} \ No newline at end of file +} diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 118e3e8193..a549eccc33 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -168,4 +168,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 33cdfb7c16..b2ac8ca0b9 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -267,4 +267,4 @@ "script": "LittlerootTown_MaysHouse_2F_EventScript_PC" } ] -} \ No newline at end of file +} diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 7aadfe03a8..b6e4e2c0c3 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -232,4 +232,4 @@ "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" } ] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index ce7474c6f9..bc96ab846f 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -125,4 +125,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index a059ed3d9b..7760094081 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index 5d70de4899..1adf44511d 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json index 186fa9dd82..af9dbd731c 100644 --- a/data/maps/MagmaHideout_2F_3R/map.json +++ b/data/maps/MagmaHideout_2F_3R/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index edf3e66716..e381630c0c 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index 70dd1bdf8f..b2a316f4e8 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json index 6ec900c315..a0e32eca54 100644 --- a/data/maps/MagmaHideout_3F_3R/map.json +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index b01200f08a..11f7f2fa32 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index 133d89fe0c..969d7b55af 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -49,4 +49,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json index 545fe1c9bd..4ae306651c 100644 --- a/data/maps/MarineCave_Entrance/map.json +++ b/data/maps/MarineCave_Entrance/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 1708008bde..a09618d047 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -297,4 +297,4 @@ "script": "MauvilleCity_EventScript_GameCornerSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 488ab5a4ee..4e95779685 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -76,4 +76,4 @@ "script": "MauvilleCity_BikeShop_EventScript_AcroBikeHandbook" } ] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index efebc685ad..c0b450f226 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -382,4 +382,4 @@ "script": "Roulette_EventScript_Table2" } ] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index ecc9f13c20..c2ac492833 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -178,4 +178,4 @@ "script": "MauvilleCity_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index 9df540885a..b51016cbda 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index acdb4f504a..5751183e7a 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 72e323bfed..8521e5d1d7 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 6540334bef..8647fd8c80 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index 000f0cf640..e4c76a7bd2 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 46e031857a..e4933a07e6 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -210,4 +210,4 @@ "script": "0x0" } ] -} \ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 1b27e859eb..3280695ca9 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -95,4 +95,4 @@ "script": "0x0" } ] -} \ No newline at end of file +} diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index c234bd8b8d..a58929a28e 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -60,4 +60,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index 8fd3eb4a2a..ee282dc16f 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index c5ad268054..ba720f6517 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json index 886e0bf88a..3ec89b5ae9 100644 --- a/data/maps/MirageTower_1F/map.json +++ b/data/maps/MirageTower_1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json index d8953d3da3..d49f2418a8 100644 --- a/data/maps/MirageTower_2F/map.json +++ b/data/maps/MirageTower_2F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json index c24e2a006d..ea1db23441 100644 --- a/data/maps/MirageTower_3F/map.json +++ b/data/maps/MirageTower_3F/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index 71e080a231..c25fb01527 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index c86bf2b6e1..f10456fdef 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 33bd1d4349..d068a92e37 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -684,4 +684,4 @@ "script": "MossdeepCity_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index 6b57ca6eff..019b7f7a27 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 967fc0a55b..bc917dcbd3 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index b2d7cb4045..d5c812a734 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 7166674a32..3161c18468 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 8be148fada..423ca5a195 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index c8018bc364..c6c5cf2e96 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index aa8691ac8a..d78833d965 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index 22f008ed17..b59688e911 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -183,4 +183,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 61729d0037..bb98ffb223 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -143,4 +143,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index c061999eff..de718e7060 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -105,4 +105,4 @@ "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" } ] -} \ No newline at end of file +} diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 52a795bdb8..a80bfc3cd2 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -454,4 +454,4 @@ "script": "MtChimney_EventScript_RouteSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 49d1028789..625fa7f4be 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 2e03ae728a..862988960e 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -100,4 +100,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index e6882c311a..59ed69806f 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -158,4 +158,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index 058c4db0a9..ff9fc3822b 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -113,4 +113,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index 5c3d72ef83..8b20b5125f 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -87,4 +87,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 1f814bda82..61f412cb0c 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -80,4 +80,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index c2de09055e..d376fab123 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 2fbcd56732..1a6eb4758e 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -129,4 +129,4 @@ "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER" } ] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index f032fbbdf1..7e4b8e33d4 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -216,4 +216,4 @@ "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY" } ] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index 6b5cd00893..f2354522f4 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json index 1ae004107a..9a7669224e 100644 --- a/data/maps/NavelRock_Bottom/map.json +++ b/data/maps/NavelRock_Bottom/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json index 50f60b52e5..ef8effb571 100644 --- a/data/maps/NavelRock_Down01/map.json +++ b/data/maps/NavelRock_Down01/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json index fb2d151457..5b9715dc86 100644 --- a/data/maps/NavelRock_Down02/map.json +++ b/data/maps/NavelRock_Down02/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json index a82e036101..9d81409551 100644 --- a/data/maps/NavelRock_Down03/map.json +++ b/data/maps/NavelRock_Down03/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json index 58e81b709e..b3ff4f6784 100644 --- a/data/maps/NavelRock_Down04/map.json +++ b/data/maps/NavelRock_Down04/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json index a1fcef804b..d477fcf823 100644 --- a/data/maps/NavelRock_Down05/map.json +++ b/data/maps/NavelRock_Down05/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json index 204a2a2cfe..91356a4954 100644 --- a/data/maps/NavelRock_Down06/map.json +++ b/data/maps/NavelRock_Down06/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json index f48063d8a0..4fc93ba1b4 100644 --- a/data/maps/NavelRock_Down07/map.json +++ b/data/maps/NavelRock_Down07/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json index d5f7ea8fea..2572c991af 100644 --- a/data/maps/NavelRock_Down08/map.json +++ b/data/maps/NavelRock_Down08/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json index 348739b31b..23d33233cb 100644 --- a/data/maps/NavelRock_Down09/map.json +++ b/data/maps/NavelRock_Down09/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json index 3aa128fa0b..88d0f679a3 100644 --- a/data/maps/NavelRock_Down10/map.json +++ b/data/maps/NavelRock_Down10/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json index 0ed44f0fcd..2de0d57718 100644 --- a/data/maps/NavelRock_Down11/map.json +++ b/data/maps/NavelRock_Down11/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json index 983df45df5..50c075fe9d 100644 --- a/data/maps/NavelRock_Entrance/map.json +++ b/data/maps/NavelRock_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index b98f08d4e4..c65aa2062c 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index 728b8a7aa4..08404c8720 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index e91dfa8d1a..1abd5a1ecd 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index c906c4ceb9..4f7afda38a 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -58,4 +58,4 @@ "flag": "FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH" } ] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json index 24d1b5a323..2ad457e366 100644 --- a/data/maps/NavelRock_Up1/map.json +++ b/data/maps/NavelRock_Up1/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json index 2d16e798c6..a3f108da15 100644 --- a/data/maps/NavelRock_Up2/map.json +++ b/data/maps/NavelRock_Up2/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json index 2e984b3792..6f8b626085 100644 --- a/data/maps/NavelRock_Up3/map.json +++ b/data/maps/NavelRock_Up3/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json index e448e6a9a0..8d3a5b0d2b 100644 --- a/data/maps/NavelRock_Up4/map.json +++ b/data/maps/NavelRock_Up4/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 593e23a627..c12d086c19 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -42,4 +42,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 8909fcbaa5..34078353c7 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -286,4 +286,4 @@ "script": "NewMauville_Inside_EventScript_Generator" } ] -} \ No newline at end of file +} diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 03155a6238..42502742a0 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index 754f98c498..f2b1db4abb 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index a27fad4972..d287baec64 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 2f92a004c5..8dada1ede9 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index c3e41775d0..e0811a74e8 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index ff64a59678..c522bf8b75 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -136,4 +136,4 @@ "script": "Common_EventScript_ShowPokemonCenterSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 8f7357246c..f3fa5a370a 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index 8c9cd91af9..de95d43155 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 11bd0761bb..066aec4bb8 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index f196f6a8aa..ea5d3fa4b2 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index c828d7a296..41328a6512 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index dd5dfcb9c9..3f7f76cbe8 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 25d8abd04e..4aa6c736dc 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 30cb6e2096..1d71f69dda 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -541,4 +541,4 @@ "script": "PetalburgCity_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index ce3dc3b162..cbff5d4b72 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 9354b49269..7509e66981 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index 82519cb5cb..9e843180af 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index d673ecf4dc..e6b4addb52 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 067d6f2373..f2601e1b2c 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index 49af9f43d6..3c0c42c5b1 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index d43017f99d..8d1f278dff 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -298,4 +298,4 @@ "script": "PetalburgWoods_EventScript_Sign2" } ] -} \ No newline at end of file +} diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index d34ad49030..255e636ef4 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -97,4 +97,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 71dbf96cc6..18b5578e94 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -198,4 +198,4 @@ "script": "Route101_EventScript_RouteSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index f8930a21df..50fe8d0de3 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -163,4 +163,4 @@ "script": "Route102_EventScript_RouteSignOldale" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 0a870a06e4..b645cf502a 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -306,4 +306,4 @@ "script": "Route103_EventScript_RouteSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index dc6c0ab4dd..d536139884 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index dcda9afeb8..d6e827500b 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index 168cee142c..2e77358b68 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index f50dced01e..e450403ab2 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index bb6aadd549..d30b6102f7 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -163,4 +163,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 273f59aa5b..86f32abd94 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -135,4 +135,4 @@ "script": "Route106_EventScript_TrainerTipsSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index b0bb63a14a..d163019cca 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -120,4 +120,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index ecdb81f6f6..253ff6ba45 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -137,4 +137,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 4ba9baf9fe..b5eb3499f3 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -414,4 +414,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index ebd5583c6f..4367a40b19 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index f0aea1aec8..3414f97f90 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -79,4 +79,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 6077876f7d..6e41c77042 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -79,4 +79,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index a488e96613..75ef7519a6 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 84233313b2..6bf0d79858 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -65,4 +65,4 @@ "flag": "FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 58ba81aea8..346efc3aae 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -99,4 +99,4 @@ "script": "Route110_TrickHouseEntrance_EventScript_Door" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index f656b0a48a..586e0b6be8 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -244,4 +244,4 @@ "script": "Route110_TrickHousePuzzle1_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index 71b3f8916d..0701407b14 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -151,4 +151,4 @@ "script": "Route110_TrickHousePuzzle2_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 612edc6bfa..7cb2ee7a4f 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -177,4 +177,4 @@ "script": "Route110_TrickHousePuzzle3_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 26a58166f2..e781e6d1ca 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -231,4 +231,4 @@ "script": "Route110_TrickHousePuzzle4_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index 30f4cfe479..0b2b24282e 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -313,4 +313,4 @@ "script": "Route110_TrickHousePuzzle5_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index 797bb9f607..bc17c15514 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -101,4 +101,4 @@ "script": "Route110_TrickHousePuzzle6_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 1e31e2f745..d0bcf043f6 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -273,4 +273,4 @@ "script": "Route110_TrickHousePuzzle7_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 9e4be0cfca..fbc4751c9d 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -101,4 +101,4 @@ "script": "Route110_TrickHousePuzzle8_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 5770ab0c0c..f267fe332f 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -1112,4 +1112,4 @@ "script": "Route111_EventScript_TrainerHillSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index 71afc39f8d..5c389d3976 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index 640de23cbc..59ac356857 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index e52468f328..ef6306c159 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -284,4 +284,4 @@ "script": "Route112_EventScript_RouteSignLavaridge" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 5ed7fc4a79..5bd9a10f9b 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index ba3cf24524..a7cf388ca9 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -462,4 +462,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 0f57ce2b8f..008dee0cc7 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 76a9083f48..ea330f94e5 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -506,4 +506,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 7a629f44ad..ee0d08dd95 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -86,4 +86,4 @@ "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index da3241ed15..df360541fa 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -72,4 +72,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index 6709d055e9..8fd9dcaa9d 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -71,4 +71,4 @@ "script": "Route114_LanettesHouse_EventScript_PC" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index c9f1d88334..2f0616c5e6 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -452,4 +452,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 366fe1ed53..d6ee64b4d6 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -524,4 +524,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index 470ccadfe8..2af75c05ec 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 4bb513cdf7..49337c76ec 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -382,4 +382,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_117_REPEL" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 9cb052633d..57fe13f319 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index d64adbb860..6d5e413057 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -418,4 +418,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 2d1be06353..e90d5984be 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -917,4 +917,4 @@ "script": "Route119_EventScript_TrainerTipsDecoration" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index f071566539..943d6e7819 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -124,4 +124,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 626d008fc0..fc72d98127 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -138,4 +138,4 @@ "script": "Route119_WeatherInstitute_1F_EventScript_Bed" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index c8048db6f2..c5b0adcc6f 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -130,4 +130,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 61e7d2892d..a4fa1c8495 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -855,4 +855,4 @@ "secret_base_id": "SECRET_BASE_SHRUB1_4" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 9d91c47d16..dfe86e324a 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -533,4 +533,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 6cf7b57915..d5aa0a0f02 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -105,4 +105,4 @@ "script": "Route121_SafariZoneEntrance_EventScript_TrainerTipSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 9dee984d92..e9d2984a2b 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index fc4af6b3c4..14e69a690e 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -837,4 +837,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index b7f2523af4..181bccd37d 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 01bc84377e..4788b30fe9 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -217,4 +217,4 @@ "script": "Route124_EventScript_HuntersHouseSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index c8ec142f2b..6c0da86611 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -55,4 +55,4 @@ "script": "Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 402c429329..7e7f6f414d 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -201,4 +201,4 @@ "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_2" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index db01091ac1..1a435accc9 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -151,4 +151,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 626982ca21..bde39b5a1e 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -218,4 +218,4 @@ "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_3" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index a7de8ed190..d9f7577025 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -194,4 +194,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 6b19cc320a..d43893ef77 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -99,4 +99,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index c0b92a1a5d..2b1cdc347c 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -81,4 +81,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index af73808b6f..5b7ad0cb0a 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -141,4 +141,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 947f8d9cf8..912d91f163 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -159,4 +159,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index fe492458aa..58b88682cd 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -159,4 +159,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index fb4da1f925..588681ccbe 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -172,4 +172,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index a4bc474762..e0e3c74498 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 9223872b91..698b4c2efa 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -96,4 +96,4 @@ "script": "RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay" } ] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index b7dbdb3d51..3bb61b6dd2 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 8e0f6d2aef..3a6fdaa51d 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -82,4 +82,4 @@ "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay" } ] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index a35fe32cf7..3949fddb0a 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index b937d323af..51897b8fe8 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -130,4 +130,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 6ca0fbd1b9..d755db2c94 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 9667ebf929..ac3423dc87 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index a9c1e40cd0..c24eaa04ee 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 99ae9ebd85..74d9bdb1d8 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -115,4 +115,4 @@ "script": "RustboroCity_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 5d30008461..d36b51345a 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 6dcd38ab4c..652e83bce8 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 66fa988339..0f076e0676 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index d56aa3095b..328ad2bc77 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index db28ddcf3d..e7dec7aef8 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index 812cb7c024..f94ad13983 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index a60add1ee3..bcc6729c7e 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -165,4 +165,4 @@ "script": "RustboroCity_PokemonSchool_EventScript_StudentNotebook" } ] -} \ No newline at end of file +} diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index b682f84a2e..aa5d20e1d3 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -216,4 +216,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 3cf4b2cd06..d7ed34d33b 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -244,4 +244,4 @@ "script": "SSTidalCorridor_EventScript_Cabin4Sign" } ] -} \ No newline at end of file +} diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 45610454ae..c15757ae22 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -61,4 +61,4 @@ "flag": "FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS" } ] -} \ No newline at end of file +} diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index b2da534c30..ecc45d7aa4 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -224,4 +224,4 @@ "script": "SSTidalRooms_EventScript_Bed" } ] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 90ecec8c2d..b35b2b74f2 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -151,4 +151,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index d362f8de32..f74add57a3 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -163,4 +163,4 @@ "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC" } ] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 7805c872e6..792b5ea032 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -55,4 +55,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index fd9ae9dcb7..8babd7e8a5 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index b23420ba42..9c4a791c71 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -120,4 +120,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index f17a9acd3a..6aabd774da 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -111,4 +111,4 @@ "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE" } ] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 261f7f49d3..314a60412f 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -72,4 +72,4 @@ "script": "SafariZone_Southwest_EventScript_RestHouseSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 5abcf9adfe..8df5d77fcb 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index 12000c6996..efa3d036f7 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 68cbba71db..9eeb712564 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index f402b50d08..972b8c1cea 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -151,4 +151,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index 428070faf6..f97b702d08 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -157,4 +157,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index c04e22e39d..951533e79c 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index b9c85c9bf1..6902bf8541 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -118,4 +118,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index 69c5330ead..0fbb31e718 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index 65c103aafb..b7b8cf2173 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index c1d3b6cc24..e28b49e35a 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -189,4 +189,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 9a2ab1d3ec..811b055106 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -127,4 +127,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index 4549a1bbd8..4b78bdae0b 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -98,4 +98,4 @@ "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall" } ] -} \ No newline at end of file +} diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index 54a10ee70c..d8e8f45b69 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -258,4 +258,4 @@ "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere" } ] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 8ac45a1473..c7fdf2e26c 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 1e8cf98fde..e3b2f7b201 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index d057ade305..5882ffbc1a 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 4cdb8de60d..6f8db58791 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 39d7d3d92f..3c9b0f87c0 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index d268e604a5..a8405f6b93 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index f1a4f656c0..ce2db65994 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 80199de730..c2c7d55f93 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index b485575b38..ed55a18959 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index fb2dd3da3a..ba4e6b3d5a 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index ac1b8c1037..a23b9a08ce 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index b3f5998f2c..aef7939742 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index b43accd3c9..f2b8879b66 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 86590e0c39..928f88b2df 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index ac14a8e45b..a6f7071a1b 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index c8b86decb5..4c673cea6b 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 93f119a926..0aab640d6b 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 96a4fc7f7d..dd296177ce 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 89fd3cf494..fdef0a4090 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index da6c9e727a..df7b2f2e27 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index e8ebdd91af..ae17a6c6a2 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 9eb60caabd..d3a7945ef6 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index 567255385b..4f168d90af 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 26a3873fc1..01c1f85a46 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index 046fe49668..5da56ae2a4 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index ff2231d67c..43bafd0bf9 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 9845375949..b505d51cac 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index d2f69b51f3..419ae4ea03 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 5bc7ef756a..e5a91af3d1 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -137,4 +137,4 @@ "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4" } ] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 6e8cbe8c94..032e9075a5 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -82,4 +82,4 @@ "script": "ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4" } ] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 7280cf1401..251b7dc448 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -55,4 +55,4 @@ "script": "ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3" } ] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index 3d1fbf51ad..82dbd2934d 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index 1e543db403..9eb0a04061 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index 56a85256f9..09d4c4e43f 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index babc00f6c6..4cbc4bca42 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 233e86dfee..1ad2917685 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index 379d6fcfb3..a829a62d13 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 4c401ccf98..02a7b769e3 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index eba1eff393..6cb13c7b24 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -62,4 +62,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 53c482597c..509d221094 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -682,4 +682,4 @@ "script": "SlateportCity_EventScript_BerryCrushRankingsSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json index e39f043637..8c9b257f57 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/map.json +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -57,4 +57,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json index eea0cac800..08f633adfe 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/map.json +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json index 45783e2c96..1c3482b23d 100644 --- a/data/maps/SlateportCity_BattleTentLobby/map.json +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -107,4 +107,4 @@ "script": "SlateportCity_BattleTentLobby_EventScript_208A99" } ] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index c9aaf1d7a1..a7c85503f9 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -188,4 +188,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_House/map.json b/data/maps/SlateportCity_House/map.json index 9052e19b1b..38093133b7 100644 --- a/data/maps/SlateportCity_House/map.json +++ b/data/maps/SlateportCity_House/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index ca1c23717d..bcd304fc55 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_NameRatersHouse/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json index 1e464b9fd5..aa661a99a8 100644 --- a/data/maps/SlateportCity_NameRatersHouse/map.json +++ b/data/maps/SlateportCity_NameRatersHouse/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 87fc0f6ee5..8d026830e4 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -346,4 +346,4 @@ "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine" } ] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 0c45541e4c..ca94abc062 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -286,4 +286,4 @@ "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" } ] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index 4f8cefda93..c73748e171 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index 74cccebf0e..f617902f12 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index 5e0e0616cd..f0148730a8 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -150,4 +150,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index d5d8fce4e4..a71cde2aee 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index 78b39989f5..1fdce590f9 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 9462063473..b96d5c1430 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -393,4 +393,4 @@ "script": "SootopolisCity_EventScript_CitySign" } ] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 9726e98aa7..835a5c896a 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -83,4 +83,4 @@ "script": "SootopolisCity_Gym_1F_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 0af53d062a..dc6ed875bf 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -156,4 +156,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index bd1488d14e..5899e1579f 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index ae30df6c68..32b3114ee4 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index b87274eee3..469f6057e5 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 586c88e906..b57e243dd4 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index fcfce0abb0..33b2d154aa 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index bd7e238828..443a916eda 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 497b36bbab..4ce7a16765 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json index bf19b4e034..207eb1a07b 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -76,4 +76,4 @@ "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_LotadSizeRecord" } ] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index 9d8ef277dc..46810b94d2 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json index 014a07dde5..065c7f6c4c 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -53,4 +53,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json index dbb651a443..82b48fa831 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 4a5eec7474..ca7361a86a 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 6c00e8e215..4be59d375e 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index cf8be22279..1aa14a8f45 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -68,4 +68,4 @@ "script": "SouthernIsland_Exterior_EventScript_Sign" } ] -} \ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index a647076bad..d571473486 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -68,4 +68,4 @@ "script": "SouthernIsland_Interior_EventScript_TryLatiEncounter" } ] -} \ No newline at end of file +} diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index 2854ec9759..f32c4167eb 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -49,4 +49,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json index 8ca5c69dff..f741c70404 100644 --- a/data/maps/TerraCave_Entrance/map.json +++ b/data/maps/TerraCave_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 98e7d46c12..1919d40a52 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -65,4 +65,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json index 77c8ee094f..9dd32783c3 100644 --- a/data/maps/TrainerHill_1F/map.json +++ b/data/maps/TrainerHill_1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json index a10f68baf4..4c4dbb5f6a 100644 --- a/data/maps/TrainerHill_2F/map.json +++ b/data/maps/TrainerHill_2F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json index dfaa57f59d..c3225ef6ea 100644 --- a/data/maps/TrainerHill_3F/map.json +++ b/data/maps/TrainerHill_3F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json index 01f20a8f7f..fd208e0122 100644 --- a/data/maps/TrainerHill_4F/map.json +++ b/data/maps/TrainerHill_4F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index 07cdaa80da..9e06784a0f 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index f581988b6c..adbc129821 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -124,4 +124,4 @@ "script": "TrainerHill_Entrance_EventScript_Records" } ] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json index 2804947880..d6db93dc1e 100644 --- a/data/maps/TrainerHill_Roof/map.json +++ b/data/maps/TrainerHill_Roof/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index 7fd45b45f3..f624ae2ae1 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -85,4 +85,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2" } ] -} \ No newline at end of file +} diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index 7977faa4f0..55eff4cca2 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -106,4 +106,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD" } ] -} \ No newline at end of file +} diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index ea87b52354..6617380112 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -81,4 +81,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD" } ] -} \ No newline at end of file +} diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index 9226717c34..09b1d05da2 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -53,4 +53,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL" } ] -} \ No newline at end of file +} diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json index abd13a187a..9a890427cc 100644 --- a/data/maps/Underwater5/map.json +++ b/data/maps/Underwater5/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json index 9b19a1fe79..771587fbc0 100644 --- a/data/maps/Underwater6/map.json +++ b/data/maps/Underwater6/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json index afabfeeecf..32e3a3a78e 100644 --- a/data/maps/Underwater7/map.json +++ b/data/maps/Underwater7/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json index c969239c5a..618807dc45 100644 --- a/data/maps/Underwater_MarineCave/map.json +++ b/data/maps/Underwater_MarineCave/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index f94f110e11..87b4a5436f 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index eedec45002..b25b7a1348 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 7579f15d57..6c82073bdf 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -34,4 +34,4 @@ "script": "Underwater_SealedChamber_EventScript_Braille" } ] -} \ No newline at end of file +} diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index a3b0a1290d..10358d2ba5 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 4c7b487fb2..914fe500f4 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -150,4 +150,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json index bcad9e1d71..c767b7ebfa 100644 --- a/data/maps/UnknownLinkContestRoom_25_29/map.json +++ b/data/maps/UnknownLinkContestRoom_25_29/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json index 4a67080068..837148655f 100644 --- a/data/maps/UnknownLinkContestRoom_25_30/map.json +++ b/data/maps/UnknownLinkContestRoom_25_30/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json index da7f875b3f..b70b755b39 100644 --- a/data/maps/UnknownLinkContestRoom_25_31/map.json +++ b/data/maps/UnknownLinkContestRoom_25_31/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json index 8d5b033dbc..d870cb7eae 100644 --- a/data/maps/UnknownLinkContestRoom_25_32/map.json +++ b/data/maps/UnknownLinkContestRoom_25_32/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json index 89c95c51b0..1db8019c98 100644 --- a/data/maps/UnknownLinkContestRoom_25_33/map.json +++ b/data/maps/UnknownLinkContestRoom_25_33/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json index 3e28789623..d9c30d0036 100644 --- a/data/maps/UnknownLinkContestRoom_25_34/map.json +++ b/data/maps/UnknownLinkContestRoom_25_34/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index e3fa08b03f..7bdc25c322 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -196,4 +196,4 @@ "script": "VerdanturfTown_EventScript_RusturfTunnelSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json index 2722518ebf..b9f9493f84 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -57,4 +57,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json index 1577459148..88e8516357 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/map.json +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json index 2a56602716..98026448f9 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/map.json +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -120,4 +120,4 @@ "script": "VerdanturfTown_BattleTentLobby_EventScript_201B02" } ] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index fa620e6820..1c35ca9f51 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index f50e62a4e4..972cb773cd 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 702a70f3dd..b3be7f53bd 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 056e82ed14..59f0556b65 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index 26f0d3aaa9..5f0453e8b9 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index c09a612743..c599df1e03 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index d769156486..e17afd483d 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -199,4 +199,4 @@ "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL" } ] -} \ No newline at end of file +} diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 3241c1364a..404b3f8cc0 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -341,4 +341,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index d78339b52c..0d837b617e 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -155,4 +155,4 @@ "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL" } ] -} \ No newline at end of file +} diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 4035bc3f39..f9c614a9b1 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -688,4 +688,4 @@ "BattleFrontier_OutsideWest", "BattleFrontier_OutsideEast" ] -} \ No newline at end of file +} diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index 1d0862a65d..eecd082737 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -682,7 +682,7 @@ BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 - special SpawnLinkPartnerEventObject + special SpawnLinkPartnerObjectEvent goto BerryBlender_EventScript_LinkPlayersArrived end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 6b2da5ccb3..354aa045e4 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,5 +1,5 @@ BerryTreeScript:: @ 82742F9 - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData switch VAR_0x8004 case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling case BERRY_STAGE_NO_BERRY, BerryTree_EventScript_CheckSoil @@ -54,7 +54,7 @@ BerryTree_EventScript_CancelPlanting:: @ 82743AF BerryTree_EventScript_CheckBerryStage1:: @ 82743B1 lockall - special EventObjectInteractionGetBerryCountString + special ObjectEventInteractionGetBerryCountString message BerryTree_Text_BerryGrowthStage1 waitmessage waitbuttonpress @@ -62,7 +62,7 @@ BerryTree_EventScript_CheckBerryStage1:: @ 82743B1 BerryTree_EventScript_CheckBerryStage2:: @ 82743C1 lockall - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_BerryGrowthStage2 waitmessage waitbuttonpress @@ -70,7 +70,7 @@ BerryTree_EventScript_CheckBerryStage2:: @ 82743C1 BerryTree_EventScript_CheckBerryStage3:: @ 82743D1 lockall - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_BerryGrowthStage3 waitmessage waitbuttonpress @@ -79,14 +79,14 @@ BerryTree_EventScript_CheckBerryStage3:: @ 82743D1 BerryTree_EventScript_CheckBerryStage4:: @ 82743E1 call BerryTree_EventScript_GetCareAdverb lockall - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_BerryGrowthStage4 waitmessage waitbuttonpress goto BerryTree_EventScript_WantToWater @ VAR_0x8005 here is the number of times watered -@ Buffered by EventObjectInteractionGetBerryTreeData +@ Buffered by ObjectEventInteractionGetBerryTreeData BerryTree_EventScript_GetCareAdverb:: @ 82743F6 compare VAR_0x8005, 0 goto_if_eq BerryTree_EventScript_SetAdverbPoor @@ -108,7 +108,7 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421 buffernumberstring 1, VAR_0x8006 lock faceplayer - special EventObjectInteractionGetBerryCountString + special ObjectEventInteractionGetBerryCountString msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_PickBerry @@ -116,11 +116,11 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421 goto_if_eq BerryTree_EventScript_CancelPickingBerry BerryTree_EventScript_PickBerry:: @ 8274448 - special EventObjectInteractionPickBerryTree + special ObjectEventInteractionPickBerryTree compare VAR_0x8004, 0 goto_if_eq BerryTree_EventScript_BerryPocketFull special IncrementDailyPickedBerries - special EventObjectInteractionRemoveBerryTree + special ObjectEventInteractionRemoveBerryTree message BerryTree_Text_PickedTheBerry playfanfare MUS_ME_KINOMI waitmessage @@ -148,7 +148,7 @@ BerryTree_EventScript_CancelPickingBerry:: @ 8274479 BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482 lockall - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData call BerryTree_EventScript_PlantBerry releaseall end @@ -157,7 +157,7 @@ BerryTree_EventScript_WantToWater:: @ 827448D checkitem ITEM_WAILMER_PAIL, 1 compare VAR_RESULT, 0 goto_if_eq BerryTree_EventScript_DontWater - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_WaterBerry @@ -169,13 +169,13 @@ BerryTree_EventScript_DontWater:: @ 82744BE end BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0 - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData lockall BerryTree_EventScript_WaterBerry:: @ 82744C4 - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_WateredTheBerry waitmessage - special EventObjectInteractionWaterBerryTree + special ObjectEventInteractionWaterBerryTree special DoWateringBerryTreeAnim waitstate message BerryTree_Text_PlantIsDelighted @@ -185,10 +185,10 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4 end BerryTree_EventScript_PlantBerry:: @ 82744DD - special EventObjectInteractionPlantBerryTree + special ObjectEventInteractionPlantBerryTree incrementgamestat GAME_STAT_PLANTED_BERRIES special IncrementDailyPlantedBerries - special EventObjectInteractionGetBerryCountString + special ObjectEventInteractionGetBerryCountString message BerryTree_Text_PlantedOneBerry waitmessage waitbuttonpress diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index cabf923b63..586f5af83d 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -490,7 +490,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5 @ For below VAR_TEMP_0 is the number of heart emotes to try to display in the audience @ The number of hearts to try to display is based on the condition of the presented pokemon and the rank @ For each heart to display a random audience member is chosen, and a new one chosen if they already displayed a heart -@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual event objects +@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual object events @ and are set to 9 if they havent displayed a heart yet, and 1 if they have ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F special GetContestMonCondition diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 456f56f45c..98faa4748d 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -210,7 +210,7 @@ GabbyAndTy_EventScript_TyBattle6:: @ 828CF36 GabbyAndTy_EventScript_FirstInterview:: @ 828CF56 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, DIR_NORTH call_if_eq GabbyAndTy_EventScript_FacePlayerNorth compare VAR_FACING, DIR_SOUTH @@ -241,7 +241,7 @@ GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1 GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, DIR_NORTH call_if_eq GabbyAndTy_EventScript_FacePlayerNorth compare VAR_FACING, DIR_SOUTH diff --git a/data/specials.inc b/data/specials.inc index 4b23995f26..40e6296ac1 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -47,19 +47,19 @@ gSpecials:: @ 81DBA64 def_special sub_80B3254 def_special TryBerryBlenderLinkup def_special GetLinkPartnerNames - def_special SpawnLinkPartnerEventObject + def_special SpawnLinkPartnerObjectEvent def_special SavePlayerParty def_special LoadPlayerParty def_special ChooseHalfPartyForBattle def_special Script_ShowLinkTrainerCard - def_special EventObjectInteractionGetBerryTreeData - def_special EventObjectInteractionGetBerryName - def_special EventObjectInteractionGetBerryCountString + def_special ObjectEventInteractionGetBerryTreeData + def_special ObjectEventInteractionGetBerryName + def_special ObjectEventInteractionGetBerryCountString def_special Bag_ChooseBerry - def_special EventObjectInteractionPlantBerryTree - def_special EventObjectInteractionPickBerryTree - def_special EventObjectInteractionRemoveBerryTree - def_special EventObjectInteractionWaterBerryTree + def_special ObjectEventInteractionPlantBerryTree + def_special ObjectEventInteractionPickBerryTree + def_special ObjectEventInteractionRemoveBerryTree + def_special ObjectEventInteractionWaterBerryTree def_special PlayerHasBerries def_special IsEnigmaBerryValid def_special GetTrainerBattleMode @@ -190,7 +190,7 @@ gSpecials:: @ 81DBA64 def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastBattleTrivia - def_special GabbyAndTySetScriptVarsToEventObjectLocalIds + def_special GabbyAndTySetScriptVarsToObjectEventLocalIds def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState @@ -339,7 +339,7 @@ gSpecials:: @ 81DBA64 def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies def_special IsSelectedMonEgg - def_special TryInitBattleTowerAwardManEventObject + def_special TryInitBattleTowerAwardManObjectEvent def_special MoveOutOfSecretBaseFromOutside def_special LoadPlayerBag def_special Script_FadeOutMapMusic diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index d77172d0bc..b22854ed50 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -16,9 +16,9 @@ void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId); u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId); void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition); -void LoadBattlePyramidEventObjectTemplates(void); -void LoadBattlePyramidFloorEventObjectScripts(void); -u8 GetNumBattlePyramidEventObjects(void); +void LoadBattlePyramidObjectEventTemplates(void); +void LoadBattlePyramidFloorObjectEventScripts(void); +u8 GetNumBattlePyramidObjectEvents(void); u16 GetBattlePyramidPickupItemId(void); #endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/berry.h b/include/berry.h index ebe1e9a384..afd1bc499f 100644 --- a/include/berry.h +++ b/include/berry.h @@ -6,7 +6,7 @@ void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); -bool32 EventObjectInteractionWaterBerryTree(void); +bool32 ObjectEventInteractionWaterBerryTree(void); bool8 IsPlayerFacingEmptyBerryTreePatch(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); @@ -19,10 +19,10 @@ u8 ItemIdToBerryType(u16 item); void GetBerryNameByBerryType(u8 berry, u8 *string); void ResetBerryTreeSparkleFlag(u8 id); void Bag_ChooseBerry(void); -void EventObjectInteractionGetBerryTreeData(void); -void EventObjectInteractionPlantBerryTree(void); -void EventObjectInteractionPickBerryTree(void); -void EventObjectInteractionRemoveBerryTree(void); +void ObjectEventInteractionGetBerryTreeData(void); +void ObjectEventInteractionPlantBerryTree(void); +void ObjectEventInteractionPickBerryTree(void); +void ObjectEventInteractionRemoveBerryTree(void); bool8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); diff --git a/include/constants/coins.h b/include/constants/coins.h index fd68f3f9ec..3ae3bb23f9 100644 --- a/include/constants/coins.h +++ b/include/constants/coins.h @@ -3,4 +3,4 @@ #define MAX_COINS 9999 -#endif // GUARD_CONSTANTS_COINS_H \ No newline at end of file +#endif // GUARD_CONSTANTS_COINS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index d39323831a..6901730447 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -25,7 +25,7 @@ // object gfx id vars // These 0x10 vars are used to dynamically control a map object's sprite. // For example, the rival's sprite id is dynamically set based on the player's gender. -// See VarGetEventObjectGraphicsId(). +// See VarGetObjectEventGraphicsId(). #define VAR_OBJ_GFX_ID_0 0x4010 #define VAR_OBJ_GFX_ID_1 0x4011 #define VAR_OBJ_GFX_ID_2 0x4012 diff --git a/include/event_data.h b/include/event_data.h index 11289c1ab8..4c1d4a046d 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -24,7 +24,7 @@ bool32 CanResetRTC(void); u16 *GetVarPointer(u16 id); u16 VarGet(u16 id); bool8 VarSet(u16 id, u16 value); -u8 VarGetEventObjectGraphicsId(u8 id); +u8 VarGetObjectEventGraphicsId(u8 id); u8 *GetFlagPointer(u16 id); u8 FlagSet(u16 id); u8 FlagClear(u16 id); diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h index 037c0080d9..f9ca40199b 100644 --- a/include/event_obj_lock.h +++ b/include/event_obj_lock.h @@ -2,12 +2,12 @@ #define GUARD_EVENT_OBJ_LOCK_H bool8 sub_80983C4(void); -void ScriptFreezeEventObjects(void); +void ScriptFreezeObjectEvents(void); bool8 sub_809847C(void); -void LockSelectedEventObject(void); +void LockSelectedObjectEvent(void); void sub_8098630(void); bool8 sub_8098734(void); -void ScriptUnfreezeEventObjects(void); +void ScriptUnfreezeObjectEvents(void); void sub_8098524(void); #endif // GUARD_EVENT_OBJ_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 93f73e6357..956f888f90 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -52,80 +52,80 @@ struct PairedPalettes const u16 *data; }; -struct LockedAnimEventObjects +struct LockedAnimObjectEvents { - u8 eventObjectIds[EVENT_OBJECTS_COUNT]; + u8 objectEventIds[EVENT_OBJECTS_COUNT]; u8 count; }; -extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; -extern const struct OamData gEventObjectBaseOam_32x8; -extern const struct OamData gEventObjectBaseOam_32x32; +extern const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[]; +extern const struct OamData gObjectEventBaseOam_32x8; +extern const struct OamData gObjectEventBaseOam_32x32; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const u8 gReflectionEffectPaletteMap[]; -extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; +extern const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[]; extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; extern const u8 *const gBerryTreePaletteSlotTablePointers[]; -void ResetEventObjects(void); +void ResetObjectEvents(void); u8 GetMoveDirectionAnimNum(u8); -u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); -bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); -u8 GetEventObjectIdByXY(s16, s16); -void SetEventObjectDirection(struct EventObject *, u8); -u8 GetFirstInactiveEventObjectId(void); -void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); +u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8); +bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *); +u8 GetObjectEventIdByXY(s16, s16); +void SetObjectEventDirection(struct ObjectEvent *, u8); +u8 GetFirstInactiveObjectEventId(void); +void RemoveObjectEventByLocalIdAndMap(u8, u8, u8); void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); -void TryMoveEventObjectToMapCoords(u8, u8, u8, s16, s16); +void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16); void PatchObjectPalette(u16, u8); void sub_808E16C(s16, s16); void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8092FF0(s16, s16, s16 *, s16 *); u8 GetFaceDirectionAnimNum(u8); void sub_80930E0(s16 *, s16 *, s16, s16); -void EventObjectClearHeldMovement(struct EventObject *); -void EventObjectClearHeldMovementIfActive(struct EventObject *); -void TrySpawnEventObjects(s16, s16); +void ObjectEventClearHeldMovement(struct ObjectEvent *); +void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *); +void TrySpawnObjectEvents(s16, s16); u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction); -u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority); -u8 TrySpawnEventObject(u8, u8, u8); -u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z); -u8 SpawnSpecialEventObject(struct EventObjectTemplate *); +u8 AddPseudoObjectEvent(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority); +u8 TrySpawnObjectEvent(u8, u8, u8); +u8 SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z); +u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *); void SetSpritePosToMapCoords(s16, s16, s16 *, s16 *); void CameraObjectReset1(void); -void EventObjectSetGraphicsId(struct EventObject *, u8 graphicsId); -void EventObjectTurn(struct EventObject *, u8); -void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId); +void ObjectEventSetGraphicsId(struct ObjectEvent *, u8 graphicsId); +void ObjectEventTurn(struct ObjectEvent *, u8); +void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8); +const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); void FreeAndReserveObjectSpritePalettes(void); void sub_808E82C(u8, u8, u8, s16, s16); void sub_808E7E4(u8, u8, u8); void sub_808E78C(u8, u8, u8, u8); void sub_808E75C(s16, s16); -void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup); -void ShiftEventObjectCoords(struct EventObject *, s16, s16); -void MoveEventObjectToMapCoords(struct EventObject *, s16, s16); -void TryOverrideEventObjectTemplateCoords(u8, u8, u8); -void InitEventObjectPalettes(u8 palSlot); -void UpdateEventObjectCurrentMovement(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *)); -u8 EventObjectFaceOppositeDirection(struct EventObject *, u8); +void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup); +void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16); +void MoveObjectEventToMapCoords(struct ObjectEvent *, s16, s16); +void TryOverrideObjectEventTemplateCoords(u8, u8, u8); +void InitObjectEventPalettes(u8 palSlot); +void UpdateObjectEventCurrentMovement(struct ObjectEvent *, struct Sprite *, bool8(struct ObjectEvent *, struct Sprite *)); +u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8); u8 GetOppositeDirection(u8); u8 GetWalkInPlaceFastestMovementAction(u32); u8 GetWalkInPlaceFastMovementAction(u32); u8 GetWalkInPlaceNormalMovementAction(u32); u8 GetWalkInPlaceSlowMovementAction(u32); -u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32); +u8 GetCollisionAtCoords(struct ObjectEvent *, s16, s16, u32); void MoveCoords(u8, s16 *, s16 *); -bool8 EventObjectIsHeldMovementActive(struct EventObject *); -u8 EventObjectClearHeldMovementIfFinished(struct EventObject *); -u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z); -void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType); +bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *); +u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *); +u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z); +void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType); u8 GetTrainerFacingDirectionMovementType(u8 direction); -const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId); -u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction); +const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId); +u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction); u8 GetFaceDirectionMovementAction(u32); u8 GetWalkNormalMovementAction(u32); u8 GetWalkFastMovementAction(u32); @@ -148,56 +148,56 @@ u8 GetFishingDirectionAnimNum(u8 direction); u8 GetAcroWheelieDirectionAnimNum(u8 direction); u8 GetFishingBiteDirectionAnimNum(u8 direction); u8 GetFishingNoCatchDirectionAnimNum(u8 direction); -bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId); -void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId); -bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject); -u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject); -u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject); -void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType); -void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject); -void ShiftStillEventObjectCoords(struct EventObject *pObject); -void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); +bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 specialAnimId); +void ObjectEventForceSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId); +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent); +u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent); +u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent); +void TryOverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent, u8 movementType); +void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent); +void ShiftStillObjectEventCoords(struct ObjectEvent *pObject); +void ObjectEventMoveDestCoords(struct ObjectEvent *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); u8 AddCameraObject(u8 linkedSpriteId); -void UpdateEventObjectsForCameraUpdate(s16 x, s16 y); +void UpdateObjectEventsForCameraUpdate(s16 x, s16 y); u8 GetWalkSlowMovementAction(u32); u8 GetJumpMovementAction(u32); bool8 AreZCoordsCompatible(u8, u8); u8 ZCoordToPriority(u8); -void EventObjectUpdateZCoord(struct EventObject *pObject); +void ObjectEventUpdateZCoord(struct ObjectEvent *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); bool8 IsZCoordMismatchAt(u8, s16, s16); -void UnfreezeEventObject(struct EventObject *); -u8 FindLockedEventObjectIndex(struct EventObject *); +void UnfreezeObjectEvent(struct ObjectEvent *); +u8 FindLockedObjectEventIndex(struct ObjectEvent *); bool8 obj_npc_ministep(struct Sprite *sprite); bool8 sub_80976EC(struct Sprite *sprite); void sub_80976DC(struct Sprite *, u8); void sub_809783C(struct Sprite *, u8, u8, u8); -void DoShadowFieldEffect(struct EventObject *); +void DoShadowFieldEffect(struct ObjectEvent *); u8 sub_809785C(struct Sprite *); u8 sub_80978E4(struct Sprite *); void SetAndStartSpriteAnim(struct Sprite *, u8, u8); bool8 SpriteAnimEnded(struct Sprite *); void sub_8097750(struct Sprite *); bool8 sub_8097758(struct Sprite *); -void CreateLevitateMovementTask(struct EventObject *); +void CreateLevitateMovementTask(struct ObjectEvent *); void DestroyExtraMovementTask(u8); -void UnfreezeEventObjects(void); -void FreezeEventObjectsExceptOne(u8 eventObjectId); +void UnfreezeObjectEvents(void); +void FreezeObjectEventsExceptOne(u8 objectEventId); void sub_8097B78(u8, u8); void sub_8098074(u8 var1, u8 var2); -void FreezeEventObjects(void); -bool8 FreezeEventObject(struct EventObject *eventObject); +void FreezeObjectEvents(void); +bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent); u8 GetMoveDirectionFastAnimNum(u8); u8 GetMoveDirectionFasterAnimNum(u8); u8 GetMoveDirectionFastestAnimNum(u8); u8 GetLedgeJumpDirection(s16, s16, u8); void CameraObjectSetFollowedObjectId(u8 objectId); u16 GetObjectPaletteTag(u8 palSlot); -void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible); +void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); s16 sub_809773C(s16 a1); s16 sub_8097728(s16 a1); void CameraObjectReset2(void); -u8 EventObjectGetBerryTreeId(u8 eventObjectId); +u8 ObjectEventGetBerryTreeId(u8 objectEventId); void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); bool8 IsBerryTreeSparkling(u8, u8, u8); @@ -262,13 +262,13 @@ u8 GetJumpMovementAction(u32); u8 GetJump2MovementAction(u32); u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority); -u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step6(struct EventObject *, struct Sprite *); +u8 MovementType_WanderAround_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step6(struct ObjectEvent *, struct Sprite *); u8 GetVectorDirection(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthNorth(s16, s16, s16, s16); u8 GetLimitedVectorDirection_WestEast(s16, s16, s16, s16); @@ -280,143 +280,143 @@ u8 GetLimitedVectorDirection_SouthNorthWest(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthNorthEast(s16, s16, s16, s16); u8 GetLimitedVectorDirection_NorthWestEast(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthWestEast(s16, s16, s16, s16); -u8 MovementType_LookAround_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step6(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *); -bool8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_LookAround_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step2(struct ObjectEvent *, struct Sprite *); +bool8 CopyablePlayerMovement_None(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 cph_IM_DIFFERENT(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Hidden_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_JogInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RunInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step2(struct ObjectEvent *, struct Sprite *); void sub_8097C44(u8 var, bool32 var2); bool32 sub_8097C8C(u8 var); void sub_8097BB4(u8 var1, u8 graphicsId); diff --git a/include/faraway_island.h b/include/faraway_island.h index 4946bda8ad..084b5a2779 100755 --- a/include/faraway_island.h +++ b/include/faraway_island.h @@ -2,9 +2,9 @@ #define GUARD_FARAWAY_ISLAND_H u32 GetMewMoveDirection(void); -bool8 sub_81D4A58(struct EventObject*); +bool8 sub_81D4A58(struct ObjectEvent*); void UpdateFarawayIslandStepCounter(void); -bool8 EventObjectIsFarawayIslandMew(struct EventObject *); +bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *); bool8 IsMewPlayingHideAndSeek(void); #endif // GUARD_FARAWAY_ISLAND_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index feb20cef6d..f722a60634 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -29,7 +29,7 @@ u8 *sub_80682A8(struct MapPosition *, u8, u8); void overworld_poison_timer_set(void); void RestartWildEncounterImmunitySteps(void); u8 *sub_8068E24(struct MapPosition *); -const u8 *GetEventObjectScriptPointerPlayerFacing(void); +const u8 *GetObjectEventScriptPointerPlayerFacing(void); bool8 sub_8068870(u16 a); bool8 sub_8068894(void); bool8 sub_8068A64(struct MapPosition *, u16); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 6ea9771e61..8257bc110b 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -9,11 +9,11 @@ u8 CreateWarpArrowSprite(void); u8 sub_8155800(u8 oldSpriteId); void sub_81555AC(u8, u8); -bool8 sub_8155DA0(struct EventObject *); -void sub_8155D78(struct EventObject *); +bool8 sub_8155DA0(struct ObjectEvent *); +void sub_8155D78(struct ObjectEvent *); void StartAshFieldEffect(s16, s16, u16, s16); -void SetUpReflection(struct EventObject*, struct Sprite*, u8); -u32 StartFieldEffectForEventObject(u8, struct EventObject*); +void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8); +u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*); u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); void sub_8155F80(struct Sprite*); void UpdateShadowFieldEffect(struct Sprite*); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 8d87779e6d..db045e540d 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -29,7 +29,7 @@ void PlayerAcroTurnJump(u8 a); void PlayerSetAnimId(u8 a, u8 b); bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction); void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction); -u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e); +u8 CheckForObjectEventCollision(struct ObjectEvent *a, s16 b, s16 c, u8 d, u8 e); u8 PlayerGetZCoord(void); void SetPlayerAvatarTransitionFlags(u16 a); void sub_808BCE8(void); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index de08fd1ec1..81f638c8d3 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -50,7 +50,7 @@ struct BackupMapLayout u16 *map; }; -struct EventObjectTemplate +struct ObjectEventTemplate { /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; @@ -102,11 +102,11 @@ struct BgEvent struct MapEvents { - u8 eventObjectCount; + u8 objectEventCount; u8 warpCount; u8 coordEventCount; u8 bgEventCount; - struct EventObjectTemplate *eventObjects; + struct ObjectEventTemplate *objectEvents; struct WarpEvent *warps; struct CoordEvent *coordEvents; struct BgEvent *bgEvents; @@ -143,7 +143,7 @@ struct MapHeader /* 0x1B */ u8 battleType; }; -struct EventObject +struct ObjectEvent { /*0x00*/ u32 active:1; u32 singleMovementActive:1; @@ -206,7 +206,7 @@ struct EventObject /*size = 0x24*/ }; -struct EventObjectGraphicsInfo +struct ObjectEventGraphicsInfo { /*0x00*/ u16 tileTag; /*0x02*/ u16 paletteTag1; @@ -298,7 +298,7 @@ struct PlayerAvatar /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving. /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning. /*0x04*/ u8 spriteId; - /*0x05*/ u8 eventObjectId; + /*0x05*/ u8 objectEventId; /*0x06*/ bool8 preventStep; /*0x07*/ u8 gender; /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie @@ -320,8 +320,8 @@ struct Camera s32 y; }; -extern struct EventObject gEventObjects[EVENT_OBJECTS_COUNT]; -extern u8 gSelectedEventObject; +extern struct ObjectEvent gObjectEvents[EVENT_OBJECTS_COUNT]; +extern u8 gSelectedObjectEvent; extern struct MapHeader gMapHeader; extern struct PlayerAvatar gPlayerAvatar; extern struct Camera gCamera; diff --git a/include/global.h b/include/global.h index af33f13cb8..56899dc68d 100644 --- a/include/global.h +++ b/include/global.h @@ -918,8 +918,8 @@ struct SaveBlock1 /*0x9C2*/ u8 field_9C2[6]; /*0x9C8*/ u16 trainerRematchStepCounter; /*0x9CA*/ u8 trainerRematches[100]; - /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; - /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[EVENT_OBJECT_TEMPLATES_COUNT]; + /*0xA30*/ struct ObjectEvent objectEvents[EVENT_OBJECTS_COUNT]; + /*0xC70*/ struct ObjectEventTemplate objectEventTemplates[EVENT_OBJECT_TEMPLATES_COUNT]; /*0x1270*/ u8 flags[FLAGS_COUNT]; /*0x139C*/ u16 vars[VARS_COUNT]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS]; diff --git a/include/load_save.h b/include/load_save.h index bf50bffd75..2f4a9ace6b 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -22,8 +22,8 @@ void SetContinueGameWarpStatusToDynamicWarp(void); void ClearContinueGameWarpStatus2(void); void SavePlayerParty(void); void LoadPlayerParty(void); -void SaveEventObjects(void); -void LoadEventObjects(void); +void SaveObjectEvents(void); +void LoadObjectEvents(void); void SaveSerializedGame(void); void LoadSerializedGame(void); void LoadPlayerBag(void); diff --git a/include/overworld.h b/include/overworld.h index b860677014..dced95007e 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -30,17 +30,17 @@ struct InitialPlayerAvatarState u8 direction; }; -struct LinkPlayerEventObject +struct LinkPlayerObjectEvent { u8 active; u8 linkPlayerId; - u8 eventObjId; + u8 objEventId; u8 movementMode; }; // Exported RAM declarations extern struct WarpData gLastUsedWarp; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4]; extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; @@ -157,6 +157,6 @@ bool32 sub_8087598(void); bool32 sub_80875C8(void); bool32 sub_8087634(void); bool32 sub_808766C(void); -void ClearLinkPlayerEventObjects(void); +void ClearLinkPlayerObjectEvents(void); #endif // GUARD_OVERWORLD_H diff --git a/include/script.h b/include/script.h index 3f92964acd..f9fb09b5de 100644 --- a/include/script.h +++ b/include/script.h @@ -59,7 +59,7 @@ bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 const u8 *GetRamScript(u8 objectId, const u8 *script); bool32 ValidateSavedRamScript(void); u8 *GetSavedRamScriptIfValid(void); -void InitRamScript_NoEventObject(u8 *script, u16 scriptSize); +void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize); // srccmd.h void SetMovingNpcId(u16 npcId); diff --git a/include/script_movement.h b/include/script_movement.h index f9a97cf46f..03f8bf0b76 100644 --- a/include/script_movement.h +++ b/include/script_movement.h @@ -3,6 +3,6 @@ bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript); bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup); -void ScriptMovement_UnfreezeEventObjects(void); +void ScriptMovement_UnfreezeObjectEvents(void); #endif // GUARD_SCRIPT_MOVEMENT_H diff --git a/include/trainer_hill.h b/include/trainer_hill.h index c07aeb6d72..c849bcceda 100644 --- a/include/trainer_hill.h +++ b/include/trainer_hill.h @@ -60,15 +60,15 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId); bool8 InTrainerHillChallenge(void); void nullsub_129(void); void PrintOnTrainerHillRecordsWindow(void); -void LoadTrainerHillEventObjectTemplates(void); -bool32 LoadTrainerHillFloorEventObjectScripts(void); +void LoadTrainerHillObjectEventTemplates(void); +bool32 LoadTrainerHillFloorObjectEventScripts(void); void GenerateTrainerHillFloorLayout(u16 *mapArg); bool32 InTrainerHill(void); u8 GetCurrentTrainerHillMapId(void); const struct WarpEvent* SetWarpDestinationTrainerHill4F(void); const struct WarpEvent* SetWarpDestinationTrainerHillFinalFloor(u8 warpEventId); u16 LocalIdToHillTrainerId(u8 localId); -bool8 GetHillTrainerFlag(u8 eventObjectId); +bool8 GetHillTrainerFlag(u8 objectEventId); void SetHillTrainerFlag(void); const u8 *GetTrainerHillTrainerScript(void); void FillHillTrainerParty(void); diff --git a/include/trainer_see.h b/include/trainer_see.h index daf9d02984..9d88e05fac 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -3,7 +3,7 @@ struct ApproachingTrainer { - u8 eventObjectId; + u8 objectEventId; u8 radius; // plus 1 const u8 *trainerScriptPtr; u8 taskId; @@ -17,14 +17,14 @@ extern bool8 gTrainerApproachedPlayer; extern u8 gApproachingTrainerId; bool8 CheckForTrainersWantingBattle(void); -void sub_80B4578(struct EventObject *var); +void sub_80B4578(struct ObjectEvent *var); void EndTrainerApproach(void); void TryPrepareSecondApproachingTrainer(void); u8 FldEff_ExclamationMarkIcon(void); u8 FldEff_QuestionMarkIcon(void); u8 FldEff_HeartIcon(void); -u8 GetCurrentApproachingTrainerEventObjectId(void); -u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId); +u8 GetCurrentApproachingTrainerObjectEventId(void); +u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId); void PlayerFaceTrainerAfterBattle(void); #endif // GUARD_TRAINER_SEE_H diff --git a/src/apprentice.c b/src/apprentice.c index 189647991f..7b68cd25b3 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -1823,7 +1823,7 @@ static void PrintMessage(void) static void Script_PrintMessage(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); DrawDialogueFrame(0, 1); diff --git a/src/battle_pike.c b/src/battle_pike.c index 36bf8dcbff..85a214b0f5 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -52,7 +52,7 @@ static void SetRoomType(void); static void GetBattlePikeData(void); static void SetBattlePikeData(void); static void GetInFinalRoom(void); -static void SetupRoomEventObjects(void); +static void SetupRoomObjectEvents(void); static void GetRoomType(void); static void sub_81A7400(void); static void sub_81A740C(void); @@ -483,7 +483,7 @@ static void (* const sBattlePikeFunctions[])(void) = GetBattlePikeData, SetBattlePikeData, GetInFinalRoom, - SetupRoomEventObjects, + SetupRoomObjectEvents, GetRoomType, sub_81A7400, sub_81A740C, @@ -551,7 +551,7 @@ static void SetRoomType(void) sRoomType = roomType; } -static void SetupRoomEventObjects(void) +static void SetupRoomObjectEvents(void) { bool32 setObjGfx1, setObjGfx2; u32 objGfx1; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 6dcd4063bf..b8e8dca76d 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -95,8 +95,8 @@ static void GetPyramidEntranceAndExitSquareIds(u8 *, u8 *); static void SetPyramidObjectPositionsUniformly(u8); static bool8 SetPyramidObjectPositionsInAndNearSquare(u8, u8); static bool8 SetPyramidObjectPositionsNearSquare(u8, u8); -static bool8 TrySetPyramidEventObjectPositionInSquare(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); -static bool8 TrySetPyramidEventObjectPositionAtCoords(bool8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); +static bool8 TrySetPyramidObjectEventPositionInSquare(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId); +static bool8 TrySetPyramidObjectEventPositionAtCoords(bool8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId); // Const rom data. #define ABILITY_RANDOM 2 // For wild mons data. @@ -1008,14 +1008,14 @@ static void SetPickupItem(void) static void HidePyramidItem(void) { - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; int i = 0; for (;;) { if (events[i].localId == gSpecialVar_LastTalked) { - // Rather than using event flags to hide the item event object, + // Rather than using event flags to hide the item object event, // it moves them far off the map bounds. events[i].x = 0x7FFF; events[i].y = 0x7FFF; @@ -1039,8 +1039,8 @@ static void ShowPostBattleHintText(void) u8 id; int textGroup = 0; int textIndex = 0; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; - u16 trainerId = LocalIdToPyramidTrainerId(gEventObjects[gSelectedEventObject].localId); + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; + u16 trainerId = LocalIdToPyramidTrainerId(gObjectEvents[gSelectedObjectEvent].localId); for (i = 0; i < ARRAY_COUNT(sTrainerTextGroups); i++) { @@ -1051,7 +1051,7 @@ static void ShowPostBattleHintText(void) } } - hintType = sHintTextTypes[gEventObjects[gSelectedEventObject].localId - 1]; + hintType = sHintTextTypes[gObjectEvents[gSelectedObjectEvent].localId - 1]; i = 0; while (!i) { @@ -1062,7 +1062,7 @@ static void ShowPostBattleHintText(void) i = 1; break; case HINT_REMAINING_ITEMS: - for (i = 0; i < GetNumBattlePyramidEventObjects(); i++) + for (i = 0; i < GetNumBattlePyramidObjectEvents(); i++) { if (events[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF) textIndex++; @@ -1241,8 +1241,8 @@ static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForEx { if ((map[x] & METATILE_ID_MASK) == FLOOR_EXIT_METATILE) { - x += 7 - gEventObjects[gSelectedEventObject].initialCoords.x; - y += 7 - gEventObjects[gSelectedEventObject].initialCoords.y; + x += 7 - gObjectEvents[gSelectedObjectEvent].initialCoords.x; + y += 7 - gObjectEvents[gSelectedObjectEvent].initialCoords.y; if (x >= minDistanceForExitHint || x <= -minDistanceForExitHint || y >= minDistanceForExitHint @@ -1309,7 +1309,7 @@ u16 LocalIdToPyramidTrainerId(u8 localId) bool8 GetBattlePyramidTrainerFlag(u8 eventId) { - return gSaveBlock2Ptr->frontier.pyramidTrainerFlags & gBitTable[gEventObjects[eventId].localId - 1]; + return gSaveBlock2Ptr->frontier.pyramidTrainerFlags & gBitTable[gObjectEvents[eventId].localId - 1]; } void MarkApproachingPyramidTrainersAsBattled(void) @@ -1317,7 +1317,7 @@ void MarkApproachingPyramidTrainersAsBattled(void) MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_A); if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) { - gSelectedEventObject = GetChosenApproachingTrainerEventObjectId(1); + gSelectedObjectEvent = GetChosenApproachingTrainerObjectEventId(1); MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_B); } } @@ -1332,10 +1332,10 @@ static void MarkPyramidTrainerAsBattled(u16 trainerId) gSaveBlock2Ptr->frontier.pyramidTrainerFlags |= gBitTable[i]; } - gEventObjects[gSelectedEventObject].movementType = MOVEMENT_TYPE_WANDER_AROUND; - gSaveBlock1Ptr->eventObjectTemplates[gSpecialVar_LastTalked - 1].movementType = MOVEMENT_TYPE_WANDER_AROUND; - gEventObjects[gSelectedEventObject].initialCoords.x = gEventObjects[gSelectedEventObject].currentCoords.x; - gEventObjects[gSelectedEventObject].initialCoords.y = gEventObjects[gSelectedEventObject].currentCoords.y; + gObjectEvents[gSelectedObjectEvent].movementType = MOVEMENT_TYPE_WANDER_AROUND; + gSaveBlock1Ptr->objectEventTemplates[gSpecialVar_LastTalked - 1].movementType = MOVEMENT_TYPE_WANDER_AROUND; + gObjectEvents[gSelectedObjectEvent].initialCoords.x = gObjectEvents[gSelectedObjectEvent].currentCoords.x; + gObjectEvents[gSelectedObjectEvent].initialCoords.y = gObjectEvents[gSelectedObjectEvent].currentCoords.y; } void GenerateBattlePyramidWildMon(void) @@ -1478,7 +1478,7 @@ void sub_81A9F80(void) ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); } -static u16 GetUniqueTrainerId(u8 eventObjectId) +static u16 GetUniqueTrainerId(u8 objectEventId) { int i; u16 trainerId; @@ -1490,24 +1490,24 @@ static u16 GetUniqueTrainerId(u8 eventObjectId) do { trainerId = sub_8162548(challengeNum + 1, battleNum); - for (i = 0; i < eventObjectId; i++) + for (i = 0; i < objectEventId; i++) { if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } - } while (i != eventObjectId); + } while (i != objectEventId); } else { do { trainerId = sub_8162548(challengeNum, battleNum); - for (i = 0; i < eventObjectId; i++) + for (i = 0; i < objectEventId; i++) { if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } - } while (i != eventObjectId); + } while (i != objectEventId); } return trainerId; @@ -1566,7 +1566,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio free(floorLayoutOffsets); } -void LoadBattlePyramidEventObjectTemplates(void) +void LoadBattlePyramidObjectEventTemplates(void) { int i; u8 id; @@ -1577,7 +1577,7 @@ void LoadBattlePyramidEventObjectTemplates(void) id = GetPyramidFloorTemplateId(); GetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId); - CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); + CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates)); for (i = 0; i < 2; i++) { u8 objectPositionsType; @@ -1612,10 +1612,10 @@ void LoadBattlePyramidEventObjectTemplates(void) } } -void LoadBattlePyramidFloorEventObjectScripts(void) +void LoadBattlePyramidFloorObjectEventScripts(void) { int i; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { @@ -1689,7 +1689,7 @@ static void SetPyramidObjectPositionsUniformly(u8 objType) } } while (!(bits & 2)); - } while (!(bits & 4) && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)); + } while (!(bits & 4) && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)); bits &= 1; } free(floorLayoutOffsets); @@ -1722,14 +1722,14 @@ static bool8 SetPyramidObjectPositionsInAndNearSquare(u8 objType, u8 squareId) { if (r7 == 0) { - if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)) + if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)) r7 = 1; else numPlacedObjects++; } if (r7 & 1) { - if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)) + if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)) { do { @@ -1737,7 +1737,7 @@ static bool8 SetPyramidObjectPositionsInAndNearSquare(u8 objType, u8 squareId) if (sBorderedSquareIds[squareId][borderedIndex] == 0xFF || borderedIndex >= 4) borderedIndex = 0; r7 += 2; - } while (r7 >> 1 != 4 && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)); + } while (r7 >> 1 != 4 && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)); numPlacedObjects++; } else @@ -1784,7 +1784,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId) for (i = 0; i < numObjects; i++) { - if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)) + if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)) { do { @@ -1792,7 +1792,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId) if (sBorderedSquareIds[squareId][borderOffset] == 0xFF || borderOffset >= 4) borderOffset = 0; r8++; - } while (r8 != 4 && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)); + } while (r8 != 4 && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)); numPlacedObjects++; } else @@ -1811,7 +1811,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId) return (numObjects / 2) > numPlacedObjects; } -static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) +static bool8 TrySetPyramidObjectEventPositionInSquare(u8 objType, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId) { int x, y; @@ -1821,7 +1821,7 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou { for (x = 7; x > -1; x--) { - if (!TrySetPyramidEventObjectPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, eventObjectId)) + if (!TrySetPyramidObjectEventPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, objectEventId)) return FALSE; } } @@ -1832,7 +1832,7 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou { for (x = 0; x < 8; x++) { - if (!TrySetPyramidEventObjectPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, eventObjectId)) + if (!TrySetPyramidObjectEventPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, objectEventId)) return FALSE; } } @@ -1841,42 +1841,42 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou return TRUE; } -static bool8 TrySetPyramidEventObjectPositionAtCoords(u8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) +static bool8 TrySetPyramidObjectEventPositionAtCoords(u8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId) { int i, j; const struct MapHeader *mapHeader; - struct EventObjectTemplate *floorEvents = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *floorEvents = gSaveBlock1Ptr->objectEventTemplates; mapHeader = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(BATTLE_PYRAMID_SQUARE01), floorLayoutOffsets[squareId] + MAP_NUM(BATTLE_PYRAMID_SQUARE01)); - for (i = 0; i < mapHeader->events->eventObjectCount; i++) + for (i = 0; i < mapHeader->events->objectEventCount; i++) { - if (mapHeader->events->eventObjects[i].x != x || mapHeader->events->eventObjects[i].y != y) + if (mapHeader->events->objectEvents[i].x != x || mapHeader->events->objectEvents[i].y != y) continue; - if (objType != OBJ_TRAINERS || mapHeader->events->eventObjects[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL) + if (objType != OBJ_TRAINERS || mapHeader->events->objectEvents[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL) { - if (objType != OBJ_ITEMS || mapHeader->events->eventObjects[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + if (objType != OBJ_ITEMS || mapHeader->events->objectEvents[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) continue; } // Ensure an object wasn't previously placed in the exact same position. - for (j = 0; j < eventObjectId; j++) + for (j = 0; j < objectEventId; j++) { if (floorEvents[j].x == x + ((squareId % 4) * 8) && floorEvents[j].y == y + ((squareId / 4) * 8)) break; } - if (j == eventObjectId) + if (j == objectEventId) { - floorEvents[eventObjectId] = mapHeader->events->eventObjects[i]; - floorEvents[eventObjectId].x += (squareId % 4) * 8; - floorEvents[eventObjectId].y += (squareId / 4) * 8; - floorEvents[eventObjectId].localId = eventObjectId + 1; - if (floorEvents[eventObjectId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + floorEvents[objectEventId] = mapHeader->events->objectEvents[i]; + floorEvents[objectEventId].x += (squareId % 4) * 8; + floorEvents[objectEventId].y += (squareId / 4) * 8; + floorEvents[objectEventId].localId = objectEventId + 1; + if (floorEvents[objectEventId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) { - i = GetUniqueTrainerId(eventObjectId); - floorEvents[eventObjectId].graphicsId = GetBattleFacilityTrainerGfxId(i); - gSaveBlock2Ptr->frontier.trainerIds[eventObjectId] = i; + i = GetUniqueTrainerId(objectEventId); + floorEvents[objectEventId].graphicsId = GetBattleFacilityTrainerGfxId(i); + gSaveBlock2Ptr->frontier.trainerIds[objectEventId] = i; } return FALSE; } @@ -1917,10 +1917,10 @@ static u8 GetPyramidFloorTemplateId(void) return 0; } -u8 GetNumBattlePyramidEventObjects(void) +u8 GetNumBattlePyramidObjectEvents(void) { u8 i; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < 16; i++) { diff --git a/src/battle_setup.c b/src/battle_setup.c index b98b5df06f..c63d38e706 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -91,7 +91,7 @@ EWRAM_DATA static u16 sTrainerBattleMode = 0; EWRAM_DATA u16 gTrainerBattleOpponent_A = 0; EWRAM_DATA u16 gTrainerBattleOpponent_B = 0; EWRAM_DATA u16 gPartnerTrainerId = 0; -EWRAM_DATA static u16 sTrainerEventObjectLocalId = 0; +EWRAM_DATA static u16 sTrainerObjectEventLocalId = 0; EWRAM_DATA static u8 *sTrainerAIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerBIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerADefeatSpeech = NULL; @@ -145,7 +145,7 @@ static const struct TrainerBattleParameter sOrdinaryBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -158,7 +158,7 @@ static const struct TrainerBattleParameter sContinueScriptBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -171,7 +171,7 @@ static const struct TrainerBattleParameter sDoubleBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -184,7 +184,7 @@ static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -197,7 +197,7 @@ static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -210,7 +210,7 @@ static const struct TrainerBattleParameter sTrainerBOrdinaryBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -223,7 +223,7 @@ static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[] { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -384,7 +384,7 @@ void BattleSetup_StartBattlePikeWildBattle(void) static void DoStandardWildBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = 0; @@ -403,7 +403,7 @@ static void DoStandardWildBattle(void) void BattleSetup_StartRoamerBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; @@ -417,7 +417,7 @@ void BattleSetup_StartRoamerBattle(void) static void DoSafariBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndSafariBattle; gBattleTypeFlags = BATTLE_TYPE_SAFARI; @@ -427,7 +427,7 @@ static void DoSafariBattle(void) static void DoBattlePikeWildBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_PIKE; @@ -1008,7 +1008,7 @@ static void InitTrainerBattleVariables(void) sTrainerBDefeatSpeech = NULL; sTrainerBBattleScriptRetAddr = NULL; } - sTrainerEventObjectLocalId = 0; + sTrainerObjectEventLocalId = 0; sTrainerVictorySpeech = NULL; sTrainerCannotBattleSpeech = NULL; sTrainerBattleEndScript = NULL; @@ -1071,10 +1071,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co void SetMapVarsToTrainer(void) { - if (sTrainerEventObjectLocalId != 0) + if (sTrainerObjectEventLocalId != 0) { - gSpecialVar_LastTalked = sTrainerEventObjectLocalId; - gSelectedEventObject = GetEventObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + gSpecialVar_LastTalked = sTrainerObjectEventLocalId; + gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } } @@ -1170,8 +1170,8 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript) { - gSelectedEventObject = trainerEventObjId; - gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; + gSelectedObjectEvent = trainerEventObjId; + gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); ScriptContext1_SetupScript(EventScript_271354); ScriptContext2_Enable(); @@ -1179,8 +1179,8 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerSc void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript) { - gSelectedEventObject = trainerEventObjId; - gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; + gSelectedObjectEvent = trainerEventObjId; + gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); } @@ -1198,9 +1198,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) void SetUpTrainerMovement(void) { - struct EventObject *eventObject = &gEventObjects[gSelectedEventObject]; + struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent]; - SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection)); + SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection)); } u8 GetTrainerBattleMode(void) @@ -1211,9 +1211,9 @@ u8 GetTrainerBattleMode(void) bool8 GetTrainerFlag(void) { if (InBattlePyramid()) - return GetBattlePyramidTrainerFlag(gSelectedEventObject); + return GetBattlePyramidTrainerFlag(gSelectedObjectEvent); else if (InTrainerHill()) - return GetHillTrainerFlag(gSelectedEventObject); + return GetHillTrainerFlag(gSelectedObjectEvent); else return FlagGet(GetTrainerAFlag()); } @@ -1358,7 +1358,7 @@ void ShowTrainerIntroSpeech(void) if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gSpecialVar_LastTalked)); else - CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); + CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gObjectEvents[gApproachingTrainers[gApproachingTrainerId].objectEventId].localId)); sub_80982B8(); } @@ -1367,7 +1367,7 @@ void ShowTrainerIntroSpeech(void) if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gSpecialVar_LastTalked)); else - CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); + CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gObjectEvents[gApproachingTrainers[gApproachingTrainerId].objectEventId].localId)); sub_80982B8(); } diff --git a/src/battle_tower.c b/src/battle_tower.c index 27fdc9d6e7..e1d54f0532 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -2508,9 +2508,9 @@ static void sub_81642A0(void) s32 challengeNum; u32 species1, species2; u32 level; - struct EventObjectTemplate *eventObjTemplates; + struct ObjectEventTemplate *objEventTemplates; - eventObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + objEventTemplates = gSaveBlock1Ptr->objectEventTemplates; lvlMode = gSaveBlock2Ptr->frontier.lvlMode; battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7; @@ -2540,7 +2540,7 @@ static void sub_81642A0(void) for (i = 0; i < 6; i++) { trainerId = gSaveBlock2Ptr->frontier.trainerIds[i]; - eventObjTemplates[i + 1].graphicsId = GetBattleFacilityTrainerGfxId(trainerId); + objEventTemplates[i + 1].graphicsId = GetBattleFacilityTrainerGfxId(trainerId); for (j = 0; j < 2; j++) { while (1) @@ -2594,7 +2594,7 @@ static void sub_81642A0(void) if (r10 != 0) { gSaveBlock2Ptr->frontier.trainerIds[6] = spArray[Random() % r10]; - eventObjTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]); + objEventTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1); sub_81640E0(gSaveBlock2Ptr->frontier.trainerIds[6]); } @@ -2637,7 +2637,7 @@ static void sub_81642A0(void) if (r10 != 0) { gSaveBlock2Ptr->frontier.trainerIds[7] = spArray[Random() % r10]; - eventObjTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]); + objEventTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2); sub_8164188(gSaveBlock2Ptr->frontier.trainerIds[7]); } diff --git a/src/battle_transition.c b/src/battle_transition.c index c344190489..df1d7b02be 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -750,7 +750,7 @@ static const struct SpriteTemplate gUnknown_085C8E68 = { .tileTag = 0xFFFF, .paletteTag = 4105, - .oam = &gEventObjectBaseOam_32x32, + .oam = &gObjectEventBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, .images = sSpriteImageTable_85C8E2C, .affineAnims = sSpriteAffineAnimTable_85C8E60, diff --git a/src/berry.c b/src/berry.c index bbaa2b03ba..4c8662e08d 100644 --- a/src/berry.c +++ b/src/berry.c @@ -995,9 +995,9 @@ struct BerryTree *GetBerryTreeInfo(u8 id) return &gSaveBlock1Ptr->berryTrees[id]; } -bool32 EventObjectInteractionWaterBerryTree(void) +bool32 ObjectEventInteractionWaterBerryTree(void) { - struct BerryTree *tree = GetBerryTreeInfo(EventObjectGetBerryTreeId(gSelectedEventObject)); + struct BerryTree *tree = GetBerryTreeInfo(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); switch (tree->stage) { @@ -1021,8 +1021,8 @@ bool32 EventObjectInteractionWaterBerryTree(void) bool8 IsPlayerFacingEmptyBerryTreePatch(void) { - if (GetEventObjectScriptPointerPlayerFacing() == BerryTreeScript - && GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == BERRY_STAGE_NO_BERRY) + if (GetObjectEventScriptPointerPlayerFacing() == BerryTreeScript + && GetStageByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent)) == BERRY_STAGE_NO_BERRY) return TRUE; else return FALSE; @@ -1030,10 +1030,10 @@ bool8 IsPlayerFacingEmptyBerryTreePatch(void) bool8 TryToWaterBerryTree(void) { - if (GetEventObjectScriptPointerPlayerFacing() != BerryTreeScript) + if (GetObjectEventScriptPointerPlayerFacing() != BerryTreeScript) return FALSE; else - return EventObjectInteractionWaterBerryTree(); + return ObjectEventInteractionWaterBerryTree(); } void ClearBerryTrees(void) @@ -1242,7 +1242,7 @@ static u16 GetStageDurationByBerryType(u8 berry) return GetBerryInfo(berry)->stageDuration * 60; } -void EventObjectInteractionGetBerryTreeData(void) +void ObjectEventInteractionGetBerryTreeData(void) { u8 id; u8 berry; @@ -1250,7 +1250,7 @@ void EventObjectInteractionGetBerryTreeData(void) u8 group; u8 num; - id = EventObjectGetBerryTreeId(gSelectedEventObject); + id = ObjectEventGetBerryTreeId(gSelectedObjectEvent); berry = GetBerryTypeByBerryTreeId(id); ResetBerryTreeSparkleFlag(id); localId = gSpecialVar_LastTalked; @@ -1265,15 +1265,15 @@ void EventObjectInteractionGetBerryTreeData(void) GetBerryCountStringByBerryType(berry, gStringVar1, gSpecialVar_0x8006); } -void EventObjectInteractionGetBerryName(void) +void ObjectEventInteractionGetBerryName(void) { - u8 berryType = GetBerryTypeByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)); + u8 berryType = GetBerryTypeByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); GetBerryNameByBerryType(berryType, gStringVar1); } -void EventObjectInteractionGetBerryCountString(void) +void ObjectEventInteractionGetBerryCountString(void) { - u8 treeId = EventObjectGetBerryTreeId(gSelectedEventObject); + u8 treeId = ObjectEventGetBerryTreeId(gSelectedObjectEvent); u8 berry = GetBerryTypeByBerryTreeId(treeId); u8 count = GetBerryCountByBerryTreeId(treeId); GetBerryCountStringByBerryType(berry, gStringVar1, count); @@ -1284,25 +1284,25 @@ void Bag_ChooseBerry(void) SetMainCallback2(CB2_ChooseBerry); } -void EventObjectInteractionPlantBerryTree(void) +void ObjectEventInteractionPlantBerryTree(void) { u8 berry = ItemIdToBerryType(gSpecialVar_ItemId); - PlantBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject), berry, 1, TRUE); - EventObjectInteractionGetBerryTreeData(); + PlantBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent), berry, 1, TRUE); + ObjectEventInteractionGetBerryTreeData(); } -void EventObjectInteractionPickBerryTree(void) +void ObjectEventInteractionPickBerryTree(void) { - u8 id = EventObjectGetBerryTreeId(gSelectedEventObject); + u8 id = ObjectEventGetBerryTreeId(gSelectedObjectEvent); u8 berry = GetBerryTypeByBerryTreeId(id); gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); } -void EventObjectInteractionRemoveBerryTree(void) +void ObjectEventInteractionRemoveBerryTree(void) { - RemoveBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject)); + RemoveBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } @@ -1328,12 +1328,12 @@ void ResetBerryTreeSparkleFlags(void) bottom = top + 8; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) + if (gObjectEvents[i].active && gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) { - cam_left = gEventObjects[i].currentCoords.x; - cam_top = gEventObjects[i].currentCoords.y; + cam_left = gObjectEvents[i].currentCoords.x; + cam_top = gObjectEvents[i].currentCoords.y; if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom) - ResetBerryTreeSparkleFlag(gEventObjects[i].trainerRange_berryTreeId); + ResetBerryTreeSparkleFlag(gObjectEvents[i].trainerRange_berryTreeId); } } } diff --git a/src/bike.c b/src/bike.c index fad61ffabb..615b87a0b8 100644 --- a/src/bike.c +++ b/src/bike.c @@ -46,7 +46,7 @@ static void Bike_UpdateDirTimerHistory(u8); static void Bike_UpdateABStartSelectHistory(u8); static u8 Bike_DPadToDirection(u16); static u8 GetBikeCollision(u8); -static u8 GetBikeCollisionAt(struct EventObject *, s16, s16, u8, u8); +static u8 GetBikeCollisionAt(struct ObjectEvent *, s16, s16, u8, u8); static bool8 IsRunningDisallowedByMetatile(u8); static void Bike_TryAdvanceCyclingRoadCollisions(); static u8 CanBikeFaceDirOnMetatile(u8, u8); @@ -186,7 +186,7 @@ static void MachBikeTransition_FaceDirection(u8 direction) static void MachBikeTransition_TurnDirection(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior)) { @@ -201,7 +201,7 @@ static void MachBikeTransition_TurnDirection(u8 direction) static void MachBikeTransition_TrySpeedUp(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; u8 collision; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == FALSE) @@ -366,10 +366,10 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerEventObj; direction = GetPlayerMovementDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; gPlayerAvatar.runningState = NOT_MOVING; if (heldKeys & B_BUTTON) @@ -413,10 +413,10 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerEventObj; direction = GetPlayerMovementDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!(heldKeys & B_BUTTON)) { // B button was released @@ -460,10 +460,10 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerEventObj; direction = GetPlayerFacingDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!(heldKeys & B_BUTTON)) { // we were moving on a wheelie, but we let go while moving. reset bike still status @@ -514,10 +514,10 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; playerEventObj->facingDirectionLocked = 0; - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection); gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; return CheckMovementInputAcroBike(ptr, newKeys, heldKeys); } @@ -535,7 +535,7 @@ static void AcroBikeTransition_FaceDirection(u8 direction) static void AcroBikeTransition_TurnDirection(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) direction = playerEventObj->movementDirection; @@ -545,7 +545,7 @@ static void AcroBikeTransition_TurnDirection(u8 direction) static void AcroBikeTransition_Moving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { @@ -570,7 +570,7 @@ static void AcroBikeTransition_Moving(u8 direction) static void AcroBikeTransition_NormalToWheelie(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) direction = playerEventObj->movementDirection; @@ -579,7 +579,7 @@ static void AcroBikeTransition_NormalToWheelie(u8 direction) static void AcroBikeTransition_WheelieToNormal(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) direction = playerEventObj->movementDirection; @@ -588,7 +588,7 @@ static void AcroBikeTransition_WheelieToNormal(u8 direction) static void AcroBikeTransition_WheelieIdle(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) direction = playerEventObj->movementDirection; @@ -597,7 +597,7 @@ static void AcroBikeTransition_WheelieIdle(u8 direction) static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) direction = playerEventObj->movementDirection; @@ -607,7 +607,7 @@ static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { @@ -641,7 +641,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) static void AcroBikeTransition_SideJump(u8 direction) { u8 collision; - struct EventObject *playerEventObj; + struct ObjectEvent *playerEventObj; collision = GetBikeCollision(direction); if (collision) @@ -659,7 +659,7 @@ static void AcroBikeTransition_SideJump(u8 direction) return; } } - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; PlaySE(SE_JITE_PYOKO); playerEventObj->facingDirectionLocked = 1; PlayerSetAnimId(GetJumpMovementAction(direction), 2); @@ -673,7 +673,7 @@ static void AcroBikeTransition_TurnJump(u8 direction) static void AcroBikeTransition_WheelieMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { @@ -707,7 +707,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) static void AcroBikeTransition_WheelieRisingMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { @@ -741,7 +741,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { @@ -868,7 +868,7 @@ static u8 Bike_DPadToDirection(u16 heldKeys) static u8 GetBikeCollision(u8 direction) { u8 metatitleBehavior; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; s16 x = playerEventObj->currentCoords.x; s16 y = playerEventObj->currentCoords.y; MoveCoords(direction, &x, &y); @@ -876,9 +876,9 @@ static u8 GetBikeCollision(u8 direction) return GetBikeCollisionAt(playerEventObj, x, y, direction, metatitleBehavior); } -static u8 GetBikeCollisionAt(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior) +static u8 GetBikeCollisionAt(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatitleBehavior) { - u8 collision = CheckForEventObjectCollision(eventObject, x, y, direction, metatitleBehavior); + u8 collision = CheckForObjectEventCollision(objectEvent, x, y, direction, metatitleBehavior); if (collision > COLLISION_EVENT_OBJECT) return collision; @@ -966,7 +966,7 @@ bool8 IsBikingDisallowedByPlayer(void) bool8 player_should_look_direction_be_enforced_upon_movement(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) != FALSE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) != FALSE) return FALSE; else return TRUE; diff --git a/src/cable_car.c b/src/cable_car.c index c6e7e724e7..25ebf91091 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -797,7 +797,7 @@ static void LoadCableCarSprites(void) { case 0: default: - spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102); + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; @@ -821,7 +821,7 @@ static void LoadCableCarSprites(void) break; case 1: CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17); - spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102); + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; @@ -852,7 +852,7 @@ static void LoadCableCarSprites(void) } if ((rval % 64) == 0) { - spriteId = AddPseudoEventObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); + spriteId = AddPseudoObjectEvent(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; diff --git a/src/data/field_event_obj/base_oam.h b/src/data/event_object/base_oam.h similarity index 63% rename from src/data/field_event_obj/base_oam.h rename to src/data/event_object/base_oam.h index af961f492f..f74feca32f 100755 --- a/src/data/field_event_obj/base_oam.h +++ b/src/data/event_object/base_oam.h @@ -1,46 +1,46 @@ -const struct OamData gEventObjectBaseOam_8x8 = { +const struct OamData gObjectEventBaseOam_8x8 = { .shape = SPRITE_SHAPE(8x8), .size = SPRITE_SIZE(8x8), .priority = 2 }; -const struct OamData gEventObjectBaseOam_16x8 = { +const struct OamData gObjectEventBaseOam_16x8 = { .shape = SPRITE_SHAPE(16x8), .size = SPRITE_SIZE(16x8), .priority = 2 }; -const struct OamData gEventObjectBaseOam_16x16 = { +const struct OamData gObjectEventBaseOam_16x16 = { .shape = SPRITE_SHAPE(16x16), .size = SPRITE_SIZE(16x16), .priority = 2 }; -const struct OamData gEventObjectBaseOam_32x8 = { +const struct OamData gObjectEventBaseOam_32x8 = { .shape = SPRITE_SHAPE(32x8), .size = SPRITE_SIZE(32x8), .priority = 2 }; -const struct OamData gEventObjectBaseOam_64x32 = { +const struct OamData gObjectEventBaseOam_64x32 = { .shape = SPRITE_SHAPE(64x32), .size = SPRITE_SIZE(64x32), .priority = 2 }; -const struct OamData gEventObjectBaseOam_16x32 = { +const struct OamData gObjectEventBaseOam_16x32 = { .shape = SPRITE_SHAPE(16x32), .size = SPRITE_SIZE(16x32), .priority = 2 }; -const struct OamData gEventObjectBaseOam_32x32 = { +const struct OamData gObjectEventBaseOam_32x32 = { .shape = SPRITE_SHAPE(32x32), .size = SPRITE_SIZE(32x32), .priority = 2 }; -const struct OamData gEventObjectBaseOam_64x64 = { +const struct OamData gObjectEventBaseOam_64x64 = { .shape = SPRITE_SHAPE(64x64), .size = SPRITE_SIZE(64x64), .priority = 2 diff --git a/src/data/event_object/berry_tree_graphics_tables.h b/src/data/event_object/berry_tree_graphics_tables.h new file mode 100755 index 0000000000..75c4bd03c0 --- /dev/null +++ b/src/data/event_object/berry_tree_graphics_tables.h @@ -0,0 +1,565 @@ +const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_KelpsyBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_WepearBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_IapapaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_CheriBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_FigyBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_MagoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LumBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_RazzBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_GrepaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_RabutaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_NomelBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LeppaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LiechiBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_HondewBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gObjectEventPicTable_AguavBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_WikiBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_PomegBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_RawstBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_SpelonBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_ChestoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_OranBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_PersimBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_SitrusBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_AspearBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_PamtreBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_CornnBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_LansatBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_DurinBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_TamatoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; + +const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES}; + +const u8 gBerryTreeObjectEventGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES}; + +const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CheriBerryTree, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_ChestoBerryTree, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PechaBerryTree, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RawstBerryTree, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AspearBerryTree, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LeppaBerryTree, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_OranBerryTree, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PersimBerryTree, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LumBerryTree, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_SitrusBerryTree, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_FigyBerryTree, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WikiBerryTree, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_MagoBerryTree, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AguavBerryTree, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_IapapaBerryTree, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RazzBerryTree, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RazzBerryTree, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_MagoBerryTree, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WepearBerryTree, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_IapapaBerryTree, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_KelpsyBerryTree, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WepearBerryTree, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_GrepaBerryTree, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_TamatoBerryTree, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CornnBerryTree, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RabutaBerryTree, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_NomelBerryTree, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_SpelonBerryTree, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PamtreBerryTree, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RabutaBerryTree, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_DurinBerryTree, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LiechiBerryTree, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AguavBerryTree, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_GrepaBerryTree, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LansatBerryTree, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CornnBerryTree, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_DurinBerryTree, +}; + +const u8 *const gBerryTreePaletteSlotTablePointers[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, +}; + +const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + // 3 unused berries. + [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, +}; diff --git a/src/data/event_object/event_object_anims.h b/src/data/event_object/event_object_anims.h new file mode 100755 index 0000000000..b319c2845f --- /dev/null +++ b/src/data/event_object/event_object_anims.h @@ -0,0 +1,1171 @@ +const union AnimCmd gObjectEventImageAnim_StayStill[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceSouth[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceNorth[] = +{ + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceWest[] = +{ + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceEast[] = +{ + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoSouth[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(3, 8, .hFlip = TRUE), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoNorth[] = +{ + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(4, 8, .hFlip = TRUE), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoWest[] = +{ + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoEast[] = +{ + ANIMCMD_FRAME(5, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(6, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastSouth[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastNorth[] = +{ + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(4, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastWest[] = +{ + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastEast[] = +{ + ANIMCMD_FRAME(5, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(6, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterSouth[] = +{ + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(3, 2, .hFlip = TRUE), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterNorth[] = +{ + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(4, 2, .hFlip = TRUE), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterWest[] = +{ + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterEast[] = +{ + ANIMCMD_FRAME(5, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_FRAME(6, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestSouth[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(3, 1, .hFlip = TRUE), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestNorth[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(4, 1, .hFlip = TRUE), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestWest[] = +{ + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestEast[] = +{ + ANIMCMD_FRAME(5, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_FRAME(6, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceSouth[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceNorth[] = +{ + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceWest[] = +{ + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceEast[] = +{ + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoSouth[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoNorth[] = +{ + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoWest[] = +{ + ANIMCMD_FRAME(7, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(8, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoEast[] = +{ + ANIMCMD_FRAME(7, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(8, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastSouth[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastNorth[] = +{ + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastWest[] = +{ + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastEast[] = +{ + ANIMCMD_FRAME(7, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(8, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterSouth[] = +{ + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterNorth[] = +{ + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterWest[] = +{ + ANIMCMD_FRAME(7, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(8, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterEast[] = +{ + ANIMCMD_FRAME(7, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_FRAME(8, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestSouth[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestNorth[] = +{ + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestWest[] = +{ + ANIMCMD_FRAME(7, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(8, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestEast[] = +{ + ANIMCMD_FRAME(7, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_FRAME(8, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunSouth[] = +{ + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_FRAME(13, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunNorth[] = +{ + ANIMCMD_FRAME(14, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_FRAME(15, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunWest[] = +{ + ANIMCMD_FRAME(16, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_FRAME(17, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunEast[] = +{ + ANIMCMD_FRAME(16, 5, .hFlip = TRUE), + ANIMCMD_FRAME(11, 3, .hFlip = TRUE), + ANIMCMD_FRAME(17, 5, .hFlip = TRUE), + ANIMCMD_FRAME(11, 3, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FieldMove[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 8), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobSouth[] = +{ + ANIMCMD_FRAME(9, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobNorth[] = +{ + ANIMCMD_FRAME(10, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobWest[] = +{ + ANIMCMD_FRAME(11, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobEast[] = +{ + ANIMCMD_FRAME(11, 32, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelSouth[] = +{ + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelNorth[] = +{ + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelWest[] = +{ + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelEast[] = +{ + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(12, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelNorth[] = +{ + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelWest[] = +{ + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(20, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelEast[] = +{ + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(20, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelSouth[] = +{ + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelNorth[] = +{ + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelWest[] = +{ + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelEast[] = +{ + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelNorth[] = +{ + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelWest[] = +{ + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelEast[] = +{ + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieSouth[] = +{ + ANIMCMD_FRAME(21, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(22, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieNorth[] = +{ + ANIMCMD_FRAME(23, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_FRAME(24, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieWest[] = +{ + ANIMCMD_FRAME(25, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_FRAME(26, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieEast[] = +{ + ANIMCMD_FRAME(25, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_FRAME(26, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage0[] = +{ + ANIMCMD_FRAME(0, 32), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage1[] = +{ + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(2, 32), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage2[] = +{ + ANIMCMD_FRAME(3, 48), + ANIMCMD_FRAME(4, 48), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage3[] = +{ + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage4[] = +{ + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_NurseBow[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(9, 32), + ANIMCMD_FRAME(0, 8), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_RockBreak[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TreeCut[] = +{ + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodSouth[] = +{ + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(11, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodNorth[] = +{ + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(7, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodWest[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodEast[] = +{ + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(9, 6), + ANIMCMD_FRAME(8, 6), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodNorth[] = +{ + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(5, 6), + ANIMCMD_FRAME(4, 6), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodWest[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodEast[] = +{ + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonSouth[] = +{ + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(11, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(11, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonNorth[] = +{ + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(7, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(7, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonWest[] = +{ + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonEast[] = +{ + ANIMCMD_FRAME(2, 6, .hFlip = TRUE), + ANIMCMD_FRAME(3, 6, .hFlip = TRUE), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8508FD8[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(7), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509008[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(15), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(15), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509040[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509050[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509060[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), + AFFINEANIMCMD_LOOP(8), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509078[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_LOOP(8), + AFFINEANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_HoOhFlapWings[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HoOhStayStill[] = +{ + ANIMCMD_FRAME(3, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Inanimate[] = { + gObjectEventImageAnim_StayStill, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_QuintyPlump[] = { + gObjectEventImageAnim_QuintyPlumpFaceSouth, + gObjectEventImageAnim_QuintyPlumpFaceNorth, + gObjectEventImageAnim_QuintyPlumpFaceWest, + gObjectEventImageAnim_QuintyPlumpFaceEast, + gObjectEventImageAnim_QuintyPlumpGoSouth, + gObjectEventImageAnim_QuintyPlumpGoNorth, + gObjectEventImageAnim_QuintyPlumpGoWest, + gObjectEventImageAnim_QuintyPlumpGoEast, + gObjectEventImageAnim_QuintyPlumpGoFastSouth, + gObjectEventImageAnim_QuintyPlumpGoFastNorth, + gObjectEventImageAnim_QuintyPlumpGoFastWest, + gObjectEventImageAnim_QuintyPlumpGoFastEast, + gObjectEventImageAnim_QuintyPlumpGoFasterSouth, + gObjectEventImageAnim_QuintyPlumpGoFasterNorth, + gObjectEventImageAnim_QuintyPlumpGoFasterWest, + gObjectEventImageAnim_QuintyPlumpGoFasterEast, + gObjectEventImageAnim_QuintyPlumpGoFastestSouth, + gObjectEventImageAnim_QuintyPlumpGoFastestNorth, + gObjectEventImageAnim_QuintyPlumpGoFastestWest, + gObjectEventImageAnim_QuintyPlumpGoFastestEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Standard[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_HoOh[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_HoOhFlapWings, + gObjectEventImageAnim_HoOhStayStill, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Groudon3[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, +}; + +const union AnimCmd gObjectEventImageAnim_85091F0[] = +{ + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_85091F8[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509200[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509208[] = +{ + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509210[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509218[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509220[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509228[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509230[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Rayquaza2[] = { + gObjectEventImageAnim_8509218, + gObjectEventImageAnim_8509220, + gObjectEventImageAnim_8509228, + gObjectEventImageAnim_8509230, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_8509208, + gObjectEventImageAnim_8509210, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_85091F0, + gObjectEventImageAnim_8509210, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_8509208, + gObjectEventImageAnim_8509210, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_8509208, + gObjectEventImageAnim_8509210, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BrendanMayNormal[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_RunSouth, + gObjectEventImageAnim_RunNorth, + gObjectEventImageAnim_RunWest, + gObjectEventImageAnim_RunEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_AcroBike[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_BunnyHoppyBackWheelSouth, + gObjectEventImageAnim_BunnyHoppyBackWheelNorth, + gObjectEventImageAnim_BunnyHoppyBackWheelWest, + gObjectEventImageAnim_BunnyHoppyBackWheelEast, + gObjectEventImageAnim_BunnyHoppyFrontWheelSouth, + gObjectEventImageAnim_BunnyHoppyFrontWheelNorth, + gObjectEventImageAnim_BunnyHoppyFrontWheelWest, + gObjectEventImageAnim_BunnyHoppyFrontWheelEast, + gObjectEventImageAnim_StandingWheelieBackWheelSouth, + gObjectEventImageAnim_StandingWheelieBackWheelNorth, + gObjectEventImageAnim_StandingWheelieBackWheelWest, + gObjectEventImageAnim_StandingWheelieBackWheelEast, + gObjectEventImageAnim_StandingWheelieFrontWheelSouth, + gObjectEventImageAnim_StandingWheelieFrontWheelNorth, + gObjectEventImageAnim_StandingWheelieFrontWheelWest, + gObjectEventImageAnim_StandingWheelieFrontWheelEast, + gObjectEventImageAnim_MovingWheelieSouth, + gObjectEventImageAnim_MovingWheelieNorth, + gObjectEventImageAnim_MovingWheelieWest, + gObjectEventImageAnim_MovingWheelieEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Surfing[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_GetOnOffSurfBlobSouth, + gObjectEventImageAnim_GetOnOffSurfBlobNorth, + gObjectEventImageAnim_GetOnOffSurfBlobWest, + gObjectEventImageAnim_GetOnOffSurfBlobEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Nurse[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_NurseBow, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_FieldMove[] = { + gObjectEventImageAnim_FieldMove, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BerryTree[] = { + gObjectEventImageAnim_BerryTreeStage0, + gObjectEventImageAnim_BerryTreeStage1, + gObjectEventImageAnim_BerryTreeStage2, + gObjectEventImageAnim_BerryTreeStage3, + gObjectEventImageAnim_BerryTreeStage4, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BreakableRock[] = { + gObjectEventImageAnim_StayStill, + gObjectEventImageAnim_RockBreak, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_CuttableTree[] = { + gObjectEventImageAnim_StayStill, + gObjectEventImageAnim_TreeCut, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Fishing[] = { + gObjectEventImageAnim_TakeOutRodSouth, + gObjectEventImageAnim_TakeOutRodNorth, + gObjectEventImageAnim_TakeOutRodWest, + gObjectEventImageAnim_TakeOutRodEast, + gObjectEventImageAnim_PutAwayRodSouth, + gObjectEventImageAnim_PutAwayRodNorth, + gObjectEventImageAnim_PutAwayRodWest, + gObjectEventImageAnim_PutAwayRodEast, + gObjectEventImageAnim_HookedPokemonSouth, + gObjectEventImageAnim_HookedPokemonNorth, + gObjectEventImageAnim_HookedPokemonWest, + gObjectEventImageAnim_HookedPokemonEast, +}; + +const union AffineAnimCmd *const gObjectEventRotScalAnimTable_KyogreGroudon[] = { + gObjectEventRotScalAnim_8508FD8, + gObjectEventRotScalAnim_8509008, + gObjectEventRotScalAnim_8509050, + gObjectEventRotScalAnim_8509040, + gObjectEventRotScalAnim_8509078, + gObjectEventRotScalAnim_8509060, +}; + +const struct UnkStruct_085094AC gUnknown_085094AC[] = { + { + .anims = gObjectEventImageAnimTable_QuintyPlump, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Standard, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_BrendanMayNormal, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_AcroBike, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Surfing, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Nurse, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Fishing, + .animPos = {1, 3, 0, 2}, + }, + { + NULL, + {0, 0, 0, 0}, + }, +}; diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/event_object/event_object_graphics.h similarity index 51% rename from src/data/field_event_obj/event_object_graphics.h rename to src/data/event_object/event_object_graphics.h index f7f1f33ba4..3e44e4133c 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/event_object/event_object_graphics.h @@ -1,9 +1,9 @@ -const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp"); -const u32 gEventObjectPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp"); -const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal"); -const u32 gEventObjectPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp"); -const u32 gEventObjectPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp"); -const u16 gEventObjectPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal"); +const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp"); +const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp"); +const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal"); +const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp"); +const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp"); +const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal"); const u16 NullPalette_8499A38[16] = {}; const u16 NullPalette_8499A58[16] = {}; const u16 NullPalette_8499A78[16] = {}; @@ -19,27 +19,27 @@ const u16 NullPalette_8499B98[16] = {}; const u16 NullPalette_8499BB8[16] = {}; const u16 NullPalette_8499BD8[16] = {}; const u16 NullPalette_8499BF8[16] = {}; -const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal"); -const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal"); -const u32 gEventObjectPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); -const u32 gEventObjectPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); -const u32 gEventObjectPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp"); -const u32 gEventObjectPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp"); -const u32 gEventObjectPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); -const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); -const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); -const u32 gEventObjectPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); -const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal"); -const u32 gEventObjectPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp"); -const u32 gEventObjectPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp"); -const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal"); -const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal"); -const u32 gEventObjectPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp"); -const u32 gEventObjectPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp"); -const u16 gEventObjectPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal"); -const u16 gUnusedEventObjectPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); +const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal"); +const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal"); +const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); +const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); +const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); +const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp"); +const u32 gObjectEventPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp"); +const u32 gObjectEventPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); +const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); +const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); +const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); +const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); +const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal"); +const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp"); +const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp"); +const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal"); +const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal"); +const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp"); +const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp"); +const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal"); +const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); const u16 NullPalette_84A54F8[16] = {}; const u16 NullPalette_84A5518[16] = {}; const u16 NullPalette_84A5538[16] = {}; @@ -54,241 +54,241 @@ const u16 NullPalette_84A5638[16] = {}; const u16 NullPalette_84A5658[16] = {}; const u16 NullPalette_84A5678[16] = {}; const u16 NullPalette_84A5698[16] = {}; -const u32 gEventObjectPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); -const u32 gEventObjectPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); -const u32 gEventObjectPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); -const u32 gEventObjectPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); -const u32 gEventObjectPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); -const u32 gEventObjectPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); -const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal"); -const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal"); -const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal"); -const u16 gEventObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal"); -const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal"); -const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal"); -const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal"); -const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal"); -const u32 gEventObjectPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp"); -const u32 gEventObjectPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp"); -const u32 gEventObjectPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); -const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); -const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); -const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); -const u32 gEventObjectPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp"); -const u32 gEventObjectPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp"); -const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); -const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); -const u32 gEventObjectPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp"); -const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); -const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); -const u32 gEventObjectPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp"); -const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); -const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); -const u32 gEventObjectPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp"); -const u32 gEventObjectPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp"); -const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); -const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); -const u32 gEventObjectPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp"); -const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); -const u32 gEventObjectPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); -const u32 gEventObjectPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp"); -const u32 gEventObjectPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp"); -const u32 gEventObjectPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp"); -const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); -const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); -const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); -const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); -const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); -const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); -const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); -const u32 gEventObjectPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); -const u32 gEventObjectPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp"); -const u32 gEventObjectPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp"); -const u32 gEventObjectPic_UnusedWoman[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman.4bpp"); -const u32 gEventObjectPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp"); -const u32 gEventObjectPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp"); -const u32 gEventObjectPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp"); -const u32 gEventObjectPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp"); -const u32 gEventObjectPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp"); -const u32 gEventObjectPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp"); -const u32 gEventObjectPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp"); -const u32 gEventObjectPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp"); -const u32 gEventObjectPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp"); -const u32 gEventObjectPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp"); -const u32 gEventObjectPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp"); -const u32 gEventObjectPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); -const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); -const u32 gEventObjectPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); -const u32 gEventObjectPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); -const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); -const u32 gEventObjectPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); -const u32 gEventObjectPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp"); -const u32 gEventObjectPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp"); -const u32 gEventObjectPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp"); -const u32 gEventObjectPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp"); -const u32 gEventObjectPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); -const u32 gEventObjectPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); -const u32 gEventObjectPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); -const u32 gEventObjectPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp"); -const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp"); -const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp"); -const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp"); -const u32 gEventObjectPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_f.4bpp"); -const u32 gEventObjectPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/sidney.4bpp"); -const u32 gEventObjectPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/phoebe.4bpp"); -const u32 gEventObjectPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/glacia.4bpp"); -const u32 gEventObjectPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/drake.4bpp"); -const u32 gEventObjectPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/roxanne.4bpp"); -const u32 gEventObjectPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/brawly.4bpp"); -const u32 gEventObjectPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/wattson.4bpp"); -const u32 gEventObjectPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/flannery.4bpp"); -const u32 gEventObjectPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/norman.4bpp"); -const u32 gEventObjectPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/winona.4bpp"); -const u32 gEventObjectPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/liza.4bpp"); -const u32 gEventObjectPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/tate.4bpp"); -const u32 gEventObjectPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp"); -const u32 gEventObjectPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp"); -const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); -const u32 gEventObjectPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); -const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); -const u32 gEventObjectPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp"); -const u32 gEventObjectPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); -const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp"); -const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp"); -const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); -const u32 gEventObjectPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); -const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); -const u32 gEventObjectPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); -const u32 gEventObjectPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); -const u32 gEventObjectPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); -const u32 gEventObjectPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp"); -const u32 gEventObjectPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); -const u32 gEventObjectPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); -const u32 gEventObjectPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); -const u32 gEventObjectPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); -const u32 gEventObjectPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); -const u32 gEventObjectPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); -const u32 gEventObjectPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); -const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal"); -const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal"); -const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal"); -const u16 gEventObjectPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal"); -const u32 gEventObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); -const u32 gEventObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); -const u32 gEventObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); -const u32 gEventObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp"); -const u32 gEventObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp"); -const u32 gEventObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp"); -const u32 gEventObjectPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp"); -const u32 gEventObjectPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp"); -const u32 gEventObjectPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp"); -const u32 gEventObjectPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp"); -const u32 gEventObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp"); -const u32 gEventObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp"); -const u32 gEventObjectPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp"); -const u32 gEventObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp"); -const u32 gEventObjectPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp"); -const u32 gEventObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp"); -const u32 gEventObjectPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp"); -const u32 gEventObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp"); -const u32 gEventObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp"); -const u32 gEventObjectPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp"); -const u32 gEventObjectPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp"); -const u32 gEventObjectPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp"); -const u32 gEventObjectPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp"); -const u32 gEventObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp"); -const u32 gEventObjectPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp"); -const u32 gEventObjectPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp"); -const u32 gEventObjectPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp"); -const u32 gEventObjectPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp"); -const u32 gEventObjectPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp"); -const u32 gEventObjectPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp"); -const u32 gEventObjectPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp"); -const u32 gEventObjectPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp"); -const u32 gEventObjectPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp"); -const u32 gEventObjectPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp"); -const u32 gEventObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp"); -const u32 gEventObjectPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp"); -const u32 gEventObjectPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp"); -const u32 gEventObjectPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp"); -const u32 gEventObjectPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp"); -const u32 gEventObjectPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp"); -const u32 gEventObjectPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp"); -const u32 gEventObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp"); -const u32 gEventObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp"); -const u32 gEventObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp"); -const u32 gEventObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp"); -const u32 gEventObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp"); -const u32 gEventObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp"); -const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp"); -const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); -const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); -const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); -const u32 gEventObjectPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); -const u32 gEventObjectPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); -const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); -const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); -const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); -const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); -const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); -const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal"); -const u32 gEventObjectPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp"); -const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal"); -const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp"); -const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal"); -const u32 gEventObjectPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); -const u16 gEventObjectPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal"); -const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); -const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); -const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); -const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal"); +const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); +const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); +const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); +const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); +const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); +const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); +const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal"); +const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal"); +const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal"); +const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal"); +const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal"); +const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal"); +const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal"); +const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal"); +const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp"); +const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp"); +const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); +const u32 gObjectEventPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); +const u32 gObjectEventPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); +const u32 gObjectEventPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); +const u32 gObjectEventPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp"); +const u32 gObjectEventPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp"); +const u32 gObjectEventPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); +const u32 gObjectEventPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); +const u32 gObjectEventPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp"); +const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); +const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); +const u32 gObjectEventPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp"); +const u32 gObjectEventPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); +const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); +const u32 gObjectEventPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp"); +const u32 gObjectEventPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp"); +const u32 gObjectEventPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); +const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); +const u32 gObjectEventPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp"); +const u32 gObjectEventPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); +const u32 gObjectEventPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); +const u32 gObjectEventPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp"); +const u32 gObjectEventPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp"); +const u32 gObjectEventPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp"); +const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); +const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); +const u32 gObjectEventPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); +const u32 gObjectEventPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); +const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); +const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); +const u32 gObjectEventPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); +const u32 gObjectEventPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); +const u32 gObjectEventPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp"); +const u32 gObjectEventPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp"); +const u32 gObjectEventPic_UnusedWoman[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman.4bpp"); +const u32 gObjectEventPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp"); +const u32 gObjectEventPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp"); +const u32 gObjectEventPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp"); +const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp"); +const u32 gObjectEventPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp"); +const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp"); +const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp"); +const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp"); +const u32 gObjectEventPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp"); +const u32 gObjectEventPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp"); +const u32 gObjectEventPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp"); +const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp"); +const u32 gObjectEventPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp"); +const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); +const u32 gObjectEventPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); +const u32 gObjectEventPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); +const u32 gObjectEventPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); +const u32 gObjectEventPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); +const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); +const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); +const u32 gObjectEventPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); +const u32 gObjectEventPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp"); +const u32 gObjectEventPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp"); +const u32 gObjectEventPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp"); +const u32 gObjectEventPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp"); +const u32 gObjectEventPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp"); +const u32 gObjectEventPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp"); +const u32 gObjectEventPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp"); +const u32 gObjectEventPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); +const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); +const u32 gObjectEventPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); +const u32 gObjectEventPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp"); +const u32 gObjectEventPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp"); +const u32 gObjectEventPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp"); +const u32 gObjectEventPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp"); +const u32 gObjectEventPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_f.4bpp"); +const u32 gObjectEventPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/sidney.4bpp"); +const u32 gObjectEventPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/phoebe.4bpp"); +const u32 gObjectEventPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/glacia.4bpp"); +const u32 gObjectEventPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/drake.4bpp"); +const u32 gObjectEventPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/roxanne.4bpp"); +const u32 gObjectEventPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/brawly.4bpp"); +const u32 gObjectEventPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/wattson.4bpp"); +const u32 gObjectEventPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/flannery.4bpp"); +const u32 gObjectEventPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/norman.4bpp"); +const u32 gObjectEventPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/winona.4bpp"); +const u32 gObjectEventPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/liza.4bpp"); +const u32 gObjectEventPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/tate.4bpp"); +const u32 gObjectEventPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp"); +const u32 gObjectEventPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp"); +const u32 gObjectEventPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); +const u32 gObjectEventPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp"); +const u32 gObjectEventPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); +const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); +const u32 gObjectEventPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp"); +const u32 gObjectEventPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); +const u32 gObjectEventPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp"); +const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp"); +const u32 gObjectEventPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); +const u32 gObjectEventPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); +const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); +const u32 gObjectEventPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); +const u32 gObjectEventPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); +const u32 gObjectEventPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); +const u32 gObjectEventPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp"); +const u32 gObjectEventPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); +const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); +const u32 gObjectEventPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); +const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); +const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); +const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); +const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); +const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal"); +const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal"); +const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal"); +const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal"); +const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); +const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); +const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); +const u32 gObjectEventPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp"); +const u32 gObjectEventPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp"); +const u32 gObjectEventPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp"); +const u32 gObjectEventPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp"); +const u32 gObjectEventPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp"); +const u32 gObjectEventPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp"); +const u32 gObjectEventPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp"); +const u32 gObjectEventPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp"); +const u32 gObjectEventPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp"); +const u32 gObjectEventPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp"); +const u32 gObjectEventPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp"); +const u32 gObjectEventPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp"); +const u32 gObjectEventPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp"); +const u32 gObjectEventPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp"); +const u32 gObjectEventPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp"); +const u32 gObjectEventPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp"); +const u32 gObjectEventPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp"); +const u32 gObjectEventPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp"); +const u32 gObjectEventPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp"); +const u32 gObjectEventPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp"); +const u32 gObjectEventPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp"); +const u32 gObjectEventPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp"); +const u32 gObjectEventPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp"); +const u32 gObjectEventPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp"); +const u32 gObjectEventPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp"); +const u32 gObjectEventPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp"); +const u32 gObjectEventPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp"); +const u32 gObjectEventPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp"); +const u32 gObjectEventPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp"); +const u32 gObjectEventPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp"); +const u32 gObjectEventPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp"); +const u32 gObjectEventPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp"); +const u32 gObjectEventPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp"); +const u32 gObjectEventPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp"); +const u32 gObjectEventPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp"); +const u32 gObjectEventPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp"); +const u32 gObjectEventPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp"); +const u32 gObjectEventPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp"); +const u32 gObjectEventPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp"); +const u32 gObjectEventPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp"); +const u32 gObjectEventPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp"); +const u32 gObjectEventPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp"); +const u32 gObjectEventPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp"); +const u32 gObjectEventPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp"); +const u32 gObjectEventPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp"); +const u32 gObjectEventPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); +const u32 gObjectEventPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); +const u32 gObjectEventPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); +const u32 gObjectEventPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); +const u32 gObjectEventPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); +const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); +const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); +const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); +const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); +const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); +const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); +const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal"); +const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp"); +const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal"); +const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); +const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp"); +const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal"); +const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); +const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal"); +const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); +const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); +const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); +const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal"); const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle.4bpp"); -const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); -const u32 gEventObjectPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); -const u32 gEventObjectPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp"); -const u32 gEventObjectPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp"); -const u32 gEventObjectPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp"); -const u32 gEventObjectPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp"); -const u32 gEventObjectPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp"); -const u32 gEventObjectPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp"); -const u32 gEventObjectPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp"); -const u32 gEventObjectPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp"); -const u32 gEventObjectPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp"); -const u32 gEventObjectPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp"); -const u32 gEventObjectPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp"); -const u32 gEventObjectPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp"); -const u32 gEventObjectPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp"); -const u32 gEventObjectPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp"); -const u32 gEventObjectPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp"); -const u32 gEventObjectPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp"); -const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp"); -const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); -const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); +const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); +const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); +const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp"); +const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp"); +const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp"); +const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp"); +const u32 gObjectEventPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp"); +const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp"); +const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp"); +const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp"); +const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp"); +const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp"); +const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp"); +const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp"); +const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp"); +const u32 gObjectEventPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp"); +const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp"); +const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp"); +const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp"); +const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp"); +const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp"); +const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp"); +const u32 gObjectEventPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp"); +const u32 gObjectEventPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp"); +const u32 gObjectEventPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp"); +const u32 gObjectEventPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp"); +const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp"); +const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp"); +const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp"); +const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); +const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); +const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp"); -const u32 gEventObjectPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); -const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); -const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal"); +const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); +const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); +const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal"); const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp"); const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp"); const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp"); @@ -331,32 +331,32 @@ const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/p const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp"); const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal"); const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp"); -const u32 gEventObjectPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp"); -const u32 gEventObjectPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp"); -const u32 gEventObjectPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp"); -const u32 gEventObjectPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp"); -const u32 gEventObjectPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp"); -const u32 gEventObjectPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp"); -const u32 gEventObjectPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp"); -const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); -const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal"); -const u32 gEventObjectPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp"); -const u32 gEventObjectPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp"); -const u16 gEventObjectPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal"); -const u32 gEventObjectPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp"); -const u32 gEventObjectPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp"); -const u16 gEventObjectPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal"); -const u32 gEventObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); -const u16 gEventObjectPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal"); -const u32 gEventObjectPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp"); -const u32 gEventObjectPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp"); -const u32 gEventObjectPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp"); -const u32 gEventObjectPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp"); -const u32 gEventObjectPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/greta.4bpp"); -const u32 gEventObjectPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp"); -const u32 gEventObjectPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp"); -const u32 gEventObjectPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp"); -const u32 gEventObjectPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp"); -const u16 gEventObjectPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); -const u32 gEventObjectPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); -const u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); +const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp"); +const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp"); +const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp"); +const u32 gObjectEventPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp"); +const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp"); +const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp"); +const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp"); +const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); +const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal"); +const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp"); +const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp"); +const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal"); +const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp"); +const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp"); +const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal"); +const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); +const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal"); +const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp"); +const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp"); +const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp"); +const u32 gObjectEventPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp"); +const u32 gObjectEventPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/greta.4bpp"); +const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp"); +const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp"); +const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp"); +const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp"); +const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); +const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); +const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); diff --git a/src/data/event_object/event_object_graphics_info.h b/src/data/event_object/event_object_graphics_info.h new file mode 100755 index 0000000000..9b500d0645 --- /dev/null +++ b/src/data/event_object/event_object_graphics_info.h @@ -0,0 +1,245 @@ +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump = {0xFFFF, EVENT_OBJ_PAL_TAG_12, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_QuintyPlump, gObjectEventPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NinjaBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Twin, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RichBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cook, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LinkReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PsychicM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maniac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HexManiac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BlackBelt, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisherman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, NULL, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfBirch, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_CuttableTree, gObjectEventPicTable_CuttableTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MartEmployee, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Teala, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BreakableRock, gObjectEventPicTable_BreakableRock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xFFFF, EVENT_OBJ_PAL_TAG_14, EVENT_OBJ_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_Truck, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_16, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xFFFF, EVENT_OBJ_PAL_TAG_27, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poochyena, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Artist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cameraman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MovingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xFFFF, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CableCar, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DevonEmployee, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sidney, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Phoebe, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Glacia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Drake, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Roxanne, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brawly, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wattson, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Flannery, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Norman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Winona, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Liza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tate, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wallace, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Steven, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wally, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_MayFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xFFFF, EVENT_OBJ_PAL_TAG_21, EVENT_OBJ_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SSTidal, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xFFFF, EVENT_OBJ_PAL_TAG_26, EVENT_OBJ_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SubmarineShadow, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PichuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MarillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DittoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WynautDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LotadDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikaCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_RoundCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KissCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SpinCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BallCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GrassCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_FireCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WaterCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GameboyKid, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ContestJudge, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MayDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Archie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maxie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreSide, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon3 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Groudon3, gObjectEventPicTable_GroudonSide, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Skitty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2 = {0xFFFF, EVENT_OBJ_PAL_TAG_22, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_24, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Rayquaza2, gObjectEventPicTable_Rayquaza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azumarill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wingull, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_10, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azurill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Juan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scott, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Statue, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kirlia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Dusclops, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Red, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Leaf, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mew, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys = {0xFFFF, EVENT_OBJ_PAL_TAG_29, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Deoxys, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone = {0xFFFF, EVENT_OBJ_PAL_TAG_30, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Anabel, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tucker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Greta, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Spenser, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Noland, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lucy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brandon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_33, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay = {0xFFFF, EVENT_OBJ_PAL_TAG_34, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lugia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {0xFFFF, EVENT_OBJ_PAL_TAG_31, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOh, gDummySpriteAffineAnimTable}; diff --git a/src/data/event_object/event_object_graphics_info_pointers.h b/src/data/event_object/event_object_graphics_info_pointers.h new file mode 100755 index 0000000000..3c4ffd2bab --- /dev/null +++ b/src/data/event_object/event_object_graphics_info_pointers.h @@ -0,0 +1,499 @@ +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2; + + +const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[] = { + [EVENT_OBJ_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal, + [EVENT_OBJ_GFX_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_BrendanMachBike, + [EVENT_OBJ_GFX_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_BrendanSurfing, + [EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_BrendanFieldMove, + [EVENT_OBJ_GFX_QUINTY_PLUMP] = &gObjectEventGraphicsInfo_QuintyPlump, + [EVENT_OBJ_GFX_NINJA_BOY] = &gObjectEventGraphicsInfo_NinjaBoy, + [EVENT_OBJ_GFX_TWIN] = &gObjectEventGraphicsInfo_Twin, + [EVENT_OBJ_GFX_BOY_1] = &gObjectEventGraphicsInfo_Boy1, + [EVENT_OBJ_GFX_GIRL_1] = &gObjectEventGraphicsInfo_Girl1, + [EVENT_OBJ_GFX_BOY_2] = &gObjectEventGraphicsInfo_Boy2, + [EVENT_OBJ_GFX_GIRL_2] = &gObjectEventGraphicsInfo_Girl2, + [EVENT_OBJ_GFX_LITTLE_BOY] = &gObjectEventGraphicsInfo_LittleBoy, + [EVENT_OBJ_GFX_LITTLE_GIRL] = &gObjectEventGraphicsInfo_LittleGirl, + [EVENT_OBJ_GFX_BOY_3] = &gObjectEventGraphicsInfo_Boy3, + [EVENT_OBJ_GFX_GIRL_3] = &gObjectEventGraphicsInfo_Girl3, + [EVENT_OBJ_GFX_RICH_BOY] = &gObjectEventGraphicsInfo_RichBoy, + [EVENT_OBJ_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1, + [EVENT_OBJ_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan, + [EVENT_OBJ_GFX_POKEFAN_F] = &gObjectEventGraphicsInfo_PokefanF, + [EVENT_OBJ_GFX_MAN_1] = &gObjectEventGraphicsInfo_Man1, + [EVENT_OBJ_GFX_WOMAN_2] = &gObjectEventGraphicsInfo_Woman2, + [EVENT_OBJ_GFX_EXPERT_M] = &gObjectEventGraphicsInfo_ExpertM, + [EVENT_OBJ_GFX_EXPERT_F] = &gObjectEventGraphicsInfo_ExpertF, + [EVENT_OBJ_GFX_MAN_2] = &gObjectEventGraphicsInfo_Man2, + [EVENT_OBJ_GFX_WOMAN_3] = &gObjectEventGraphicsInfo_Woman3, + [EVENT_OBJ_GFX_POKEFAN_M] = &gObjectEventGraphicsInfo_PokefanM, + [EVENT_OBJ_GFX_WOMAN_4] = &gObjectEventGraphicsInfo_Woman4, + [EVENT_OBJ_GFX_COOK] = &gObjectEventGraphicsInfo_Cook, + [EVENT_OBJ_GFX_LINK_RECEPTIONIST] = &gObjectEventGraphicsInfo_LinkReceptionist, + [EVENT_OBJ_GFX_OLD_MAN] = &gObjectEventGraphicsInfo_OldMan, + [EVENT_OBJ_GFX_OLD_WOMAN] = &gObjectEventGraphicsInfo_OldWoman, + [EVENT_OBJ_GFX_CAMPER] = &gObjectEventGraphicsInfo_Camper, + [EVENT_OBJ_GFX_PICNICKER] = &gObjectEventGraphicsInfo_Picnicker, + [EVENT_OBJ_GFX_MAN_3] = &gObjectEventGraphicsInfo_Man3, + [EVENT_OBJ_GFX_WOMAN_5] = &gObjectEventGraphicsInfo_Woman5, + [EVENT_OBJ_GFX_YOUNGSTER] = &gObjectEventGraphicsInfo_Youngster, + [EVENT_OBJ_GFX_BUG_CATCHER] = &gObjectEventGraphicsInfo_BugCatcher, + [EVENT_OBJ_GFX_PSYCHIC_M] = &gObjectEventGraphicsInfo_PsychicM, + [EVENT_OBJ_GFX_SCHOOL_KID_M] = &gObjectEventGraphicsInfo_SchoolKidM, + [EVENT_OBJ_GFX_MANIAC] = &gObjectEventGraphicsInfo_Maniac, + [EVENT_OBJ_GFX_HEX_MANIAC] = &gObjectEventGraphicsInfo_HexManiac, + [EVENT_OBJ_GFX_RAYQUAZA_1] = &gObjectEventGraphicsInfo_Rayquaza1, + [EVENT_OBJ_GFX_SWIMMER_M] = &gObjectEventGraphicsInfo_SwimmerM, + [EVENT_OBJ_GFX_SWIMMER_F] = &gObjectEventGraphicsInfo_SwimmerF, + [EVENT_OBJ_GFX_BLACK_BELT] = &gObjectEventGraphicsInfo_BlackBelt, + [EVENT_OBJ_GFX_BEAUTY] = &gObjectEventGraphicsInfo_Beauty, + [EVENT_OBJ_GFX_SCIENTIST_1] = &gObjectEventGraphicsInfo_Scientist1, + [EVENT_OBJ_GFX_LASS] = &gObjectEventGraphicsInfo_Lass, + [EVENT_OBJ_GFX_GENTLEMAN] = &gObjectEventGraphicsInfo_Gentleman, + [EVENT_OBJ_GFX_SAILOR] = &gObjectEventGraphicsInfo_Sailor, + [EVENT_OBJ_GFX_FISHERMAN] = &gObjectEventGraphicsInfo_Fisherman, + [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_RunningTriathleteM, + [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_RunningTriathleteF, + [EVENT_OBJ_GFX_TUBER_F] = &gObjectEventGraphicsInfo_TuberF, + [EVENT_OBJ_GFX_TUBER_M] = &gObjectEventGraphicsInfo_TuberM, + [EVENT_OBJ_GFX_HIKER] = &gObjectEventGraphicsInfo_Hiker, + [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_CyclingTriathleteM, + [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_CyclingTriathleteF, + [EVENT_OBJ_GFX_NURSE] = &gObjectEventGraphicsInfo_Nurse, + [EVENT_OBJ_GFX_ITEM_BALL] = &gObjectEventGraphicsInfo_ItemBall, + [EVENT_OBJ_GFX_BERRY_TREE] = &gObjectEventGraphicsInfo_BerryTree, + [EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES] = &gObjectEventGraphicsInfo_BerryTreeEarlyStages, + [EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES] = &gObjectEventGraphicsInfo_BerryTreeLateStages, + [EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_BrendanAcroBike, + [EVENT_OBJ_GFX_PROF_BIRCH] = &gObjectEventGraphicsInfo_ProfBirch, + [EVENT_OBJ_GFX_MAN_4] = &gObjectEventGraphicsInfo_Man4, + [EVENT_OBJ_GFX_MAN_5] = &gObjectEventGraphicsInfo_Man5, + [EVENT_OBJ_GFX_REPORTER_M] = &gObjectEventGraphicsInfo_ReporterM, + [EVENT_OBJ_GFX_REPORTER_F] = &gObjectEventGraphicsInfo_ReporterF, + [EVENT_OBJ_GFX_BARD] = &gObjectEventGraphicsInfo_Bard, + [EVENT_OBJ_GFX_ANABEL] = &gObjectEventGraphicsInfo_Anabel, + [EVENT_OBJ_GFX_TUCKER] = &gObjectEventGraphicsInfo_Tucker, + [EVENT_OBJ_GFX_GRETA] = &gObjectEventGraphicsInfo_Greta, + [EVENT_OBJ_GFX_SPENSER] = &gObjectEventGraphicsInfo_Spenser, + [EVENT_OBJ_GFX_NOLAND] = &gObjectEventGraphicsInfo_Noland, + [EVENT_OBJ_GFX_LUCY] = &gObjectEventGraphicsInfo_Lucy, + [EVENT_OBJ_GFX_UNUSED_NATU_DOLL] = &gObjectEventGraphicsInfo_UnusedNatuDoll, + [EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL] = &gObjectEventGraphicsInfo_UnusedMagnemiteDoll, + [EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL] = &gObjectEventGraphicsInfo_UnusedSquirtleDoll, + [EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL] = &gObjectEventGraphicsInfo_UnusedWooperDoll, + [EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_UnusedPikachuDoll, + [EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL] = &gObjectEventGraphicsInfo_UnusedPorygon2Doll, + [EVENT_OBJ_GFX_CUTTABLE_TREE] = &gObjectEventGraphicsInfo_CuttableTree, + [EVENT_OBJ_GFX_MART_EMPLOYEE] = &gObjectEventGraphicsInfo_MartEmployee, + [EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN] = &gObjectEventGraphicsInfo_RooftopSaleWoman, + [EVENT_OBJ_GFX_TEALA] = &gObjectEventGraphicsInfo_Teala, + [EVENT_OBJ_GFX_BREAKABLE_ROCK] = &gObjectEventGraphicsInfo_BreakableRock, + [EVENT_OBJ_GFX_PUSHABLE_BOULDER] = &gObjectEventGraphicsInfo_PushableBoulder, + [EVENT_OBJ_GFX_MR_BRINEYS_BOAT] = &gObjectEventGraphicsInfo_MrBrineysBoat, + [EVENT_OBJ_GFX_MAY_NORMAL] = &gObjectEventGraphicsInfo_MayNormal, + [EVENT_OBJ_GFX_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_MayMachBike, + [EVENT_OBJ_GFX_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_MayAcroBike, + [EVENT_OBJ_GFX_MAY_SURFING] = &gObjectEventGraphicsInfo_MaySurfing, + [EVENT_OBJ_GFX_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_MayFieldMove, + [EVENT_OBJ_GFX_TRUCK] = &gObjectEventGraphicsInfo_Truck, + [EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX] = &gObjectEventGraphicsInfo_VigorothCarryingBox, + [EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY] = &gObjectEventGraphicsInfo_VigorothFacingAway, + [EVENT_OBJ_GFX_BIRCHS_BAG] = &gObjectEventGraphicsInfo_BirchsBag, + [EVENT_OBJ_GFX_ZIGZAGOON_1] = &gObjectEventGraphicsInfo_EnemyZigzagoon, + [EVENT_OBJ_GFX_ARTIST] = &gObjectEventGraphicsInfo_Artist, + [EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_RivalBrendanNormal, + [EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanMachBike, + [EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanAcroBike, + [EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_RivalBrendanSurfing, + [EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalBrendanFieldMove, + [EVENT_OBJ_GFX_RIVAL_MAY_NORMAL] = &gObjectEventGraphicsInfo_RivalMayNormal, + [EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalMayMachBike, + [EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalMayAcroBike, + [EVENT_OBJ_GFX_RIVAL_MAY_SURFING] = &gObjectEventGraphicsInfo_RivalMaySurfing, + [EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalMayFieldMove, + [EVENT_OBJ_GFX_CAMERAMAN] = &gObjectEventGraphicsInfo_Cameraman, + [EVENT_OBJ_GFX_BRENDAN_UNDERWATER] = &gObjectEventGraphicsInfo_BrendanUnderwater, + [EVENT_OBJ_GFX_MAY_UNDERWATER] = &gObjectEventGraphicsInfo_MayUnderwater, + [EVENT_OBJ_GFX_MOVING_BOX] = &gObjectEventGraphicsInfo_MovingBox, + [EVENT_OBJ_GFX_CABLE_CAR] = &gObjectEventGraphicsInfo_CableCar, + [EVENT_OBJ_GFX_SCIENTIST_2] = &gObjectEventGraphicsInfo_Scientist2, + [EVENT_OBJ_GFX_DEVON_EMPLOYEE] = &gObjectEventGraphicsInfo_DevonEmployee, + [EVENT_OBJ_GFX_AQUA_MEMBER_M] = &gObjectEventGraphicsInfo_AquaMemberM, + [EVENT_OBJ_GFX_AQUA_MEMBER_F] = &gObjectEventGraphicsInfo_AquaMemberF, + [EVENT_OBJ_GFX_MAGMA_MEMBER_M] = &gObjectEventGraphicsInfo_MagmaMemberM, + [EVENT_OBJ_GFX_MAGMA_MEMBER_F] = &gObjectEventGraphicsInfo_MagmaMemberF, + [EVENT_OBJ_GFX_SIDNEY] = &gObjectEventGraphicsInfo_Sidney, + [EVENT_OBJ_GFX_PHOEBE] = &gObjectEventGraphicsInfo_Phoebe, + [EVENT_OBJ_GFX_GLACIA] = &gObjectEventGraphicsInfo_Glacia, + [EVENT_OBJ_GFX_DRAKE] = &gObjectEventGraphicsInfo_Drake, + [EVENT_OBJ_GFX_ROXANNE] = &gObjectEventGraphicsInfo_Roxanne, + [EVENT_OBJ_GFX_BRAWLY] = &gObjectEventGraphicsInfo_Brawly, + [EVENT_OBJ_GFX_WATTSON] = &gObjectEventGraphicsInfo_Wattson, + [EVENT_OBJ_GFX_FLANNERY] = &gObjectEventGraphicsInfo_Flannery, + [EVENT_OBJ_GFX_NORMAN] = &gObjectEventGraphicsInfo_Norman, + [EVENT_OBJ_GFX_WINONA] = &gObjectEventGraphicsInfo_Winona, + [EVENT_OBJ_GFX_LIZA] = &gObjectEventGraphicsInfo_Liza, + [EVENT_OBJ_GFX_TATE] = &gObjectEventGraphicsInfo_Tate, + [EVENT_OBJ_GFX_WALLACE] = &gObjectEventGraphicsInfo_Wallace, + [EVENT_OBJ_GFX_STEVEN] = &gObjectEventGraphicsInfo_Steven, + [EVENT_OBJ_GFX_WALLY] = &gObjectEventGraphicsInfo_Wally, + [EVENT_OBJ_GFX_LITTLE_BOY_3] = &gObjectEventGraphicsInfo_RubySapphireLittleBoy, + [EVENT_OBJ_GFX_BRENDAN_FISHING] = &gObjectEventGraphicsInfo_BrendanFishing, + [EVENT_OBJ_GFX_MAY_FISHING] = &gObjectEventGraphicsInfo_MayFishing, + [EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN] = &gObjectEventGraphicsInfo_HotSpringsOldWoman, + [EVENT_OBJ_GFX_SS_TIDAL] = &gObjectEventGraphicsInfo_SSTidal, + [EVENT_OBJ_GFX_SUBMARINE_SHADOW] = &gObjectEventGraphicsInfo_SubmarineShadow, + [EVENT_OBJ_GFX_PICHU_DOLL] = &gObjectEventGraphicsInfo_PichuDoll, + [EVENT_OBJ_GFX_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_PikachuDoll, + [EVENT_OBJ_GFX_MARILL_DOLL] = &gObjectEventGraphicsInfo_MarillDoll, + [EVENT_OBJ_GFX_TOGEPI_DOLL] = &gObjectEventGraphicsInfo_TogepiDoll, + [EVENT_OBJ_GFX_CYNDAQUIL_DOLL] = &gObjectEventGraphicsInfo_CyndaquilDoll, + [EVENT_OBJ_GFX_CHIKORITA_DOLL] = &gObjectEventGraphicsInfo_ChikoritaDoll, + [EVENT_OBJ_GFX_TOTODILE_DOLL] = &gObjectEventGraphicsInfo_TotodileDoll, + [EVENT_OBJ_GFX_JIGGLYPUFF_DOLL] = &gObjectEventGraphicsInfo_JigglypuffDoll, + [EVENT_OBJ_GFX_MEOWTH_DOLL] = &gObjectEventGraphicsInfo_MeowthDoll, + [EVENT_OBJ_GFX_CLEFAIRY_DOLL] = &gObjectEventGraphicsInfo_ClefairyDoll, + [EVENT_OBJ_GFX_DITTO_DOLL] = &gObjectEventGraphicsInfo_DittoDoll, + [EVENT_OBJ_GFX_SMOOCHUM_DOLL] = &gObjectEventGraphicsInfo_SmoochumDoll, + [EVENT_OBJ_GFX_TREECKO_DOLL] = &gObjectEventGraphicsInfo_TreeckoDoll, + [EVENT_OBJ_GFX_TORCHIC_DOLL] = &gObjectEventGraphicsInfo_TorchicDoll, + [EVENT_OBJ_GFX_MUDKIP_DOLL] = &gObjectEventGraphicsInfo_MudkipDoll, + [EVENT_OBJ_GFX_DUSKULL_DOLL] = &gObjectEventGraphicsInfo_DuskullDoll, + [EVENT_OBJ_GFX_WYNAUT_DOLL] = &gObjectEventGraphicsInfo_WynautDoll, + [EVENT_OBJ_GFX_BALTOY_DOLL] = &gObjectEventGraphicsInfo_BaltoyDoll, + [EVENT_OBJ_GFX_KECLEON_DOLL] = &gObjectEventGraphicsInfo_KecleonDoll, + [EVENT_OBJ_GFX_AZURILL_DOLL] = &gObjectEventGraphicsInfo_AzurillDoll, + [EVENT_OBJ_GFX_SKITTY_DOLL] = &gObjectEventGraphicsInfo_SkittyDoll, + [EVENT_OBJ_GFX_SWABLU_DOLL] = &gObjectEventGraphicsInfo_SwabluDoll, + [EVENT_OBJ_GFX_GULPIN_DOLL] = &gObjectEventGraphicsInfo_GulpinDoll, + [EVENT_OBJ_GFX_LOTAD_DOLL] = &gObjectEventGraphicsInfo_LotadDoll, + [EVENT_OBJ_GFX_SEEDOT_DOLL] = &gObjectEventGraphicsInfo_SeedotDoll, + [EVENT_OBJ_GFX_PIKA_CUSHION] = &gObjectEventGraphicsInfo_PikaCushion, + [EVENT_OBJ_GFX_ROUND_CUSHION] = &gObjectEventGraphicsInfo_RoundCushion, + [EVENT_OBJ_GFX_KISS_CUSHION] = &gObjectEventGraphicsInfo_KissCushion, + [EVENT_OBJ_GFX_ZIGZAG_CUSHION] = &gObjectEventGraphicsInfo_ZigzagCushion, + [EVENT_OBJ_GFX_SPIN_CUSHION] = &gObjectEventGraphicsInfo_SpinCushion, + [EVENT_OBJ_GFX_DIAMOND_CUSHION] = &gObjectEventGraphicsInfo_DiamondCushion, + [EVENT_OBJ_GFX_BALL_CUSHION] = &gObjectEventGraphicsInfo_BallCushion, + [EVENT_OBJ_GFX_GRASS_CUSHION] = &gObjectEventGraphicsInfo_GrassCushion, + [EVENT_OBJ_GFX_FIRE_CUSHION] = &gObjectEventGraphicsInfo_FireCushion, + [EVENT_OBJ_GFX_WATER_CUSHION] = &gObjectEventGraphicsInfo_WaterCushion, + [EVENT_OBJ_GFX_BIG_SNORLAX_DOLL] = &gObjectEventGraphicsInfo_BigSnorlaxDoll, + [EVENT_OBJ_GFX_BIG_RHYDON_DOLL] = &gObjectEventGraphicsInfo_BigRhydonDoll, + [EVENT_OBJ_GFX_BIG_LAPRAS_DOLL] = &gObjectEventGraphicsInfo_BigLaprasDoll, + [EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL] = &gObjectEventGraphicsInfo_BigVenusaurDoll, + [EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL] = &gObjectEventGraphicsInfo_BigCharizardDoll, + [EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL] = &gObjectEventGraphicsInfo_BigBlastoiseDoll, + [EVENT_OBJ_GFX_BIG_WAILMER_DOLL] = &gObjectEventGraphicsInfo_BigWailmerDoll, + [EVENT_OBJ_GFX_BIG_REGIROCK_DOLL] = &gObjectEventGraphicsInfo_BigRegirockDoll, + [EVENT_OBJ_GFX_BIG_REGICE_DOLL] = &gObjectEventGraphicsInfo_BigRegiceDoll, + [EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL] = &gObjectEventGraphicsInfo_BigRegisteelDoll, + [EVENT_OBJ_GFX_LATIAS] = &gObjectEventGraphicsInfo_Latias, + [EVENT_OBJ_GFX_LATIOS] = &gObjectEventGraphicsInfo_Latios, + [EVENT_OBJ_GFX_GAMEBOY_KID] = &gObjectEventGraphicsInfo_GameboyKid, + [EVENT_OBJ_GFX_CONTEST_JUDGE] = &gObjectEventGraphicsInfo_ContestJudge, + [EVENT_OBJ_GFX_BRENDAN_WATERING] = &gObjectEventGraphicsInfo_BrendanWatering, + [EVENT_OBJ_GFX_MAY_WATERING] = &gObjectEventGraphicsInfo_MayWatering, + [EVENT_OBJ_GFX_BRENDAN_DECORATING] = &gObjectEventGraphicsInfo_BrendanDecorating, + [EVENT_OBJ_GFX_MAY_DECORATING] = &gObjectEventGraphicsInfo_MayDecorating, + [EVENT_OBJ_GFX_ARCHIE] = &gObjectEventGraphicsInfo_Archie, + [EVENT_OBJ_GFX_MAXIE] = &gObjectEventGraphicsInfo_Maxie, + [EVENT_OBJ_GFX_KYOGRE_1] = &gObjectEventGraphicsInfo_Kyogre1, + [EVENT_OBJ_GFX_GROUDON_1] = &gObjectEventGraphicsInfo_Groudon1, + [EVENT_OBJ_GFX_FOSSIL] = &gObjectEventGraphicsInfo_Fossil, + [EVENT_OBJ_GFX_REGIROCK] = &gObjectEventGraphicsInfo_Regirock, + [EVENT_OBJ_GFX_REGICE] = &gObjectEventGraphicsInfo_Regice, + [EVENT_OBJ_GFX_REGISTEEL] = &gObjectEventGraphicsInfo_Registeel, + [EVENT_OBJ_GFX_SKITTY] = &gObjectEventGraphicsInfo_Skitty, + [EVENT_OBJ_GFX_KECLEON_1] = &gObjectEventGraphicsInfo_Kecleon1, + [EVENT_OBJ_GFX_KYOGRE_2] = &gObjectEventGraphicsInfo_Kyogre2, + [EVENT_OBJ_GFX_GROUDON_2] = &gObjectEventGraphicsInfo_Groudon2, + [EVENT_OBJ_GFX_RAYQUAZA_2] = &gObjectEventGraphicsInfo_Rayquaza2, + [EVENT_OBJ_GFX_ZIGZAGOON_2] = &gObjectEventGraphicsInfo_Zigzagoon, + [EVENT_OBJ_GFX_PIKACHU] = &gObjectEventGraphicsInfo_Pikachu, + [EVENT_OBJ_GFX_AZUMARILL] = &gObjectEventGraphicsInfo_Azumarill, + [EVENT_OBJ_GFX_WINGULL] = &gObjectEventGraphicsInfo_Wingull, + [EVENT_OBJ_GFX_KECLEON_2] = &gObjectEventGraphicsInfo_Kecleon2, + [EVENT_OBJ_GFX_TUBER_M_SWIMMING] = &gObjectEventGraphicsInfo_TuberMSwimming, + [EVENT_OBJ_GFX_AZURILL] = &gObjectEventGraphicsInfo_Azurill, + [EVENT_OBJ_GFX_MOM] = &gObjectEventGraphicsInfo_Mom, + [EVENT_OBJ_GFX_LINK_BRENDAN] = &gObjectEventGraphicsInfo_LinkBrendan, + [EVENT_OBJ_GFX_LINK_MAY] = &gObjectEventGraphicsInfo_LinkMay, + [EVENT_OBJ_GFX_JUAN] = &gObjectEventGraphicsInfo_Juan, + [EVENT_OBJ_GFX_SCOTT] = &gObjectEventGraphicsInfo_Scott, + [EVENT_OBJ_GFX_POOCHYENA] = &gObjectEventGraphicsInfo_Poochyena, + [EVENT_OBJ_GFX_KYOGRE_3] = &gObjectEventGraphicsInfo_Kyogre3, + [EVENT_OBJ_GFX_GROUDON_3] = &gObjectEventGraphicsInfo_Groudon3, + [EVENT_OBJ_GFX_MYSTERY_GIFT_MAN] = &gObjectEventGraphicsInfo_MysteryEventDeliveryman, + [EVENT_OBJ_GFX_TRICK_HOUSE_STATUE] = &gObjectEventGraphicsInfo_Statue, + [EVENT_OBJ_GFX_KIRLIA] = &gObjectEventGraphicsInfo_Kirlia, + [EVENT_OBJ_GFX_DUSCLOPS] = &gObjectEventGraphicsInfo_Dusclops, + [EVENT_OBJ_GFX_UNION_ROOM_NURSE] = &gObjectEventGraphicsInfo_UnionRoomAttendant, + [EVENT_OBJ_GFX_SUDOWOODO] = &gObjectEventGraphicsInfo_Sudowoodo, + [EVENT_OBJ_GFX_MEW] = &gObjectEventGraphicsInfo_Mew, + [EVENT_OBJ_GFX_RED] = &gObjectEventGraphicsInfo_Red, + [EVENT_OBJ_GFX_LEAF] = &gObjectEventGraphicsInfo_Leaf, + [EVENT_OBJ_GFX_DEOXYS] = &gObjectEventGraphicsInfo_Deoxys, + [EVENT_OBJ_GFX_DEOXYS_TRIANGLE] = &gObjectEventGraphicsInfo_BirthIslandStone, + [EVENT_OBJ_GFX_BRANDON] = &gObjectEventGraphicsInfo_Brandon, + [EVENT_OBJ_GFX_LINK_RS_BRENDAN] = &gObjectEventGraphicsInfo_RubySapphireBrendan, + [EVENT_OBJ_GFX_LINK_RS_MAY] = &gObjectEventGraphicsInfo_RubySapphireMay, + [EVENT_OBJ_GFX_LUGIA] = &gObjectEventGraphicsInfo_Lugia, + [EVENT_OBJ_GFX_HOOH] = &gObjectEventGraphicsInfo_HoOh, +}; + +const struct ObjectEventGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { + [MAUVILLE_MAN_BARD] = &gObjectEventGraphicsInfo_Bard, + [MAUVILLE_MAN_HIPSTER] = &gObjectEventGraphicsInfo_Hipster, + [MAUVILLE_MAN_TRADER] = &gObjectEventGraphicsInfo_Trader, + [MAUVILLE_MAN_STORYTELLER] = &gObjectEventGraphicsInfo_Storyteller, + [MAUVILLE_MAN_GIDDY] = &gObjectEventGraphicsInfo_Giddy, + [MAUVILLE_MAN_UNUSED1] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan1, + [MAUVILLE_MAN_UNUSED2] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan2, +}; diff --git a/src/data/event_object/event_object_pic_tables.h b/src/data/event_object/event_object_pic_tables.h new file mode 100755 index 0000000000..9cfdca7c16 --- /dev/null +++ b/src/data/event_object/event_object_pic_tables.h @@ -0,0 +1,2174 @@ +const struct SpriteFrameImage gObjectEventPicTable_BrendanNormal[] = { + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 8), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 0), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 1), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 2), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 3), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 4), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 5), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 6), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 7), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanMachBike[] = { + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanAcroBike[] = { + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 8), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 9), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 10), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 11), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 12), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 13), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 14), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 15), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 16), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 17), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 18), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 19), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 20), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 21), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 22), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 23), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 24), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 25), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 26), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanSurfing[] = { + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanUnderwater[] = { + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanFieldMove[] = { + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_QuintyPlump[] = { + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 0), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 1), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 2), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 3), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 4), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 5), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 6), +}; + +const struct SpriteFrameImage gObjectEventPicTable_NinjaBoy[] = { + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 0), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 1), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 2), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 3), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 4), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 5), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 6), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 7), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Twin[] = { + overworld_frame(gObjectEventPic_Twin, 2, 4, 0), + overworld_frame(gObjectEventPic_Twin, 2, 4, 1), + overworld_frame(gObjectEventPic_Twin, 2, 4, 2), + overworld_frame(gObjectEventPic_Twin, 2, 4, 3), + overworld_frame(gObjectEventPic_Twin, 2, 4, 4), + overworld_frame(gObjectEventPic_Twin, 2, 4, 5), + overworld_frame(gObjectEventPic_Twin, 2, 4, 6), + overworld_frame(gObjectEventPic_Twin, 2, 4, 7), + overworld_frame(gObjectEventPic_Twin, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy1[] = { + overworld_frame(gObjectEventPic_Boy1, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl1[] = { + overworld_frame(gObjectEventPic_Girl1, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy2[] = { + overworld_frame(gObjectEventPic_Boy2, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl2[] = { + overworld_frame(gObjectEventPic_Girl2, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleBoy[] = { + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleGirl[] = { + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy3[] = { + overworld_frame(gObjectEventPic_Boy3, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl3[] = { + overworld_frame(gObjectEventPic_Girl3, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RichBoy[] = { + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 0), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 1), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 2), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 3), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 4), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 5), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 6), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 7), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman1[] = { + overworld_frame(gObjectEventPic_Woman1, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_FatMan[] = { + overworld_frame(gObjectEventPic_FatMan, 2, 4, 0), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 1), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 2), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 3), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 4), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 5), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 6), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 7), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PokefanF[] = { + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 0), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 1), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 2), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 3), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 4), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 5), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 6), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 7), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man1[] = { + overworld_frame(gObjectEventPic_Man1, 2, 4, 0), + overworld_frame(gObjectEventPic_Man1, 2, 4, 1), + overworld_frame(gObjectEventPic_Man1, 2, 4, 2), + overworld_frame(gObjectEventPic_Man1, 2, 4, 3), + overworld_frame(gObjectEventPic_Man1, 2, 4, 4), + overworld_frame(gObjectEventPic_Man1, 2, 4, 5), + overworld_frame(gObjectEventPic_Man1, 2, 4, 6), + overworld_frame(gObjectEventPic_Man1, 2, 4, 7), + overworld_frame(gObjectEventPic_Man1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman2[] = { + overworld_frame(gObjectEventPic_Woman2, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ExpertM[] = { + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 0), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 1), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 2), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 3), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 4), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 5), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 6), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 7), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ExpertF[] = { + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 0), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 1), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 2), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 3), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 4), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 5), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 6), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 7), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man2[] = { + overworld_frame(gObjectEventPic_Man2, 2, 4, 0), + overworld_frame(gObjectEventPic_Man2, 2, 4, 1), + overworld_frame(gObjectEventPic_Man2, 2, 4, 2), + overworld_frame(gObjectEventPic_Man2, 2, 4, 3), + overworld_frame(gObjectEventPic_Man2, 2, 4, 4), + overworld_frame(gObjectEventPic_Man2, 2, 4, 5), + overworld_frame(gObjectEventPic_Man2, 2, 4, 6), + overworld_frame(gObjectEventPic_Man2, 2, 4, 7), + overworld_frame(gObjectEventPic_Man2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman3[] = { + overworld_frame(gObjectEventPic_Woman3, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PokefanM[] = { + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 0), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 1), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 2), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 3), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 4), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 5), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 6), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 7), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman4[] = { + overworld_frame(gObjectEventPic_Woman4, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Cook[] = { + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LinkReceptionist[] = { + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 0), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 1), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 2), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 3), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 4), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 5), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 6), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 7), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldMan[] = { + overworld_frame(gObjectEventPic_OldMan, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldWoman[] = { + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Camper[] = { + overworld_frame(gObjectEventPic_Camper, 2, 4, 0), + overworld_frame(gObjectEventPic_Camper, 2, 4, 1), + overworld_frame(gObjectEventPic_Camper, 2, 4, 2), + overworld_frame(gObjectEventPic_Camper, 2, 4, 3), + overworld_frame(gObjectEventPic_Camper, 2, 4, 4), + overworld_frame(gObjectEventPic_Camper, 2, 4, 5), + overworld_frame(gObjectEventPic_Camper, 2, 4, 6), + overworld_frame(gObjectEventPic_Camper, 2, 4, 7), + overworld_frame(gObjectEventPic_Camper, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Picnicker[] = { + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 0), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 1), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 2), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 3), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 4), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 5), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 6), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 7), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man3[] = { + overworld_frame(gObjectEventPic_Man3, 2, 4, 0), + overworld_frame(gObjectEventPic_Man3, 2, 4, 1), + overworld_frame(gObjectEventPic_Man3, 2, 4, 2), + overworld_frame(gObjectEventPic_Man3, 2, 4, 3), + overworld_frame(gObjectEventPic_Man3, 2, 4, 4), + overworld_frame(gObjectEventPic_Man3, 2, 4, 5), + overworld_frame(gObjectEventPic_Man3, 2, 4, 6), + overworld_frame(gObjectEventPic_Man3, 2, 4, 7), + overworld_frame(gObjectEventPic_Man3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman5[] = { + overworld_frame(gObjectEventPic_Woman5, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Youngster[] = { + overworld_frame(gObjectEventPic_Youngster, 2, 4, 0), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 1), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 2), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 3), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 4), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 5), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 6), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 7), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BugCatcher[] = { + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 0), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 1), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 2), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 3), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 4), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 5), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 6), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 7), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PsychicM[] = { + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 0), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 1), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 2), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 3), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 4), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 5), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 6), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 7), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SchoolKidM[] = { + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 0), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 1), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 2), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 3), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 4), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 5), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 6), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 7), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Maniac[] = { + overworld_frame(gObjectEventPic_Maniac, 2, 4, 0), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 1), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 2), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 3), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 4), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 5), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 6), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 7), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_HexManiac[] = { + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 0), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 1), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 2), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 3), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 4), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 5), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 6), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 7), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwimmerM[] = { + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 0), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 1), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 2), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 3), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 4), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 5), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 6), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 7), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwimmerF[] = { + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 0), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 1), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 2), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 3), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 4), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 5), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 6), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 7), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BlackBelt[] = { + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 0), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 1), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 2), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 3), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 4), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 5), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 6), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 7), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Beauty[] = { + overworld_frame(gObjectEventPic_Beauty, 2, 4, 0), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 1), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 2), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 3), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 4), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 5), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 6), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 7), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scientist1[] = { + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 0), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 1), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 2), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 3), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 4), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 5), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 6), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 7), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Lass[] = { + overworld_frame(gObjectEventPic_Lass, 2, 4, 0), + overworld_frame(gObjectEventPic_Lass, 2, 4, 1), + overworld_frame(gObjectEventPic_Lass, 2, 4, 2), + overworld_frame(gObjectEventPic_Lass, 2, 4, 3), + overworld_frame(gObjectEventPic_Lass, 2, 4, 4), + overworld_frame(gObjectEventPic_Lass, 2, 4, 5), + overworld_frame(gObjectEventPic_Lass, 2, 4, 6), + overworld_frame(gObjectEventPic_Lass, 2, 4, 7), + overworld_frame(gObjectEventPic_Lass, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Gentleman[] = { + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 0), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 1), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 2), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 3), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 4), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 5), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 6), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 7), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sailor[] = { + overworld_frame(gObjectEventPic_Sailor, 2, 4, 0), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 1), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 2), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 3), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 4), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 5), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 6), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 7), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Fisherman[] = { + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 0), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 1), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 2), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 3), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 4), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 5), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 6), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 7), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RunningTriathleteM[] = { + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 0), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 1), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 2), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 3), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 4), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 5), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 6), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 7), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RunningTriathleteF[] = { + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 0), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 1), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 2), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 3), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 4), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 5), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 6), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 7), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberF[] = { + overworld_frame(gObjectEventPic_TuberF, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberM[] = { + overworld_frame(gObjectEventPic_TuberM, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Hiker[] = { + overworld_frame(gObjectEventPic_Hiker, 2, 4, 0), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 1), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 2), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 3), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 4), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 5), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 6), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 7), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyclingTriathleteM[] = { + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 0), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 1), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 2), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 3), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 4), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 5), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 6), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 7), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyclingTriathleteF[] = { + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 0), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 1), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 2), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 3), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 4), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 5), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 6), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 7), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Nurse[] = { + overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ItemBall[] = { + obj_frame_tiles(gObjectEventPic_ItemBall), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ProfBirch[] = { + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 0), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 1), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 2), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 3), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 4), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 5), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 6), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 7), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man4[] = { + overworld_frame(gObjectEventPic_Man4, 2, 4, 0), + overworld_frame(gObjectEventPic_Man4, 2, 4, 1), + overworld_frame(gObjectEventPic_Man4, 2, 4, 2), + overworld_frame(gObjectEventPic_Man4, 2, 4, 3), + overworld_frame(gObjectEventPic_Man4, 2, 4, 4), + overworld_frame(gObjectEventPic_Man4, 2, 4, 5), + overworld_frame(gObjectEventPic_Man4, 2, 4, 6), + overworld_frame(gObjectEventPic_Man4, 2, 4, 7), + overworld_frame(gObjectEventPic_Man4, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man5[] = { + overworld_frame(gObjectEventPic_Man5, 2, 4, 0), + overworld_frame(gObjectEventPic_Man5, 2, 4, 1), + overworld_frame(gObjectEventPic_Man5, 2, 4, 2), + overworld_frame(gObjectEventPic_Man5, 2, 4, 3), + overworld_frame(gObjectEventPic_Man5, 2, 4, 4), + overworld_frame(gObjectEventPic_Man5, 2, 4, 5), + overworld_frame(gObjectEventPic_Man5, 2, 4, 6), + overworld_frame(gObjectEventPic_Man5, 2, 4, 7), + overworld_frame(gObjectEventPic_Man5, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ReporterM[] = { + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 0), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 1), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 2), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 3), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 4), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 5), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 6), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 7), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ReporterF[] = { + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 0), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 1), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 2), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 3), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 4), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 5), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 6), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 7), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MauvilleOldMan1[] = { + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 0), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 1), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 2), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 3), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 4), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 5), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 6), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 7), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MauvilleOldMan2[] = { + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 0), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 1), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 2), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 3), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 4), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 5), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 6), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 7), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedNatuDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedNatuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedMagnemiteDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedMagnemiteDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedSquirtleDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedSquirtleDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedWooperDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedWooperDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedPikachuDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedPikachuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedPorygon2Doll[] = { + obj_frame_tiles(gObjectEventPic_UnusedPorygon2Doll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CuttableTree[] = { + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 0), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 1), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 2), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MartEmployee[] = { + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 0), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 1), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 2), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 3), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 4), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 5), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 6), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 7), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RooftopSaleWoman[] = { + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Teala[] = { + overworld_frame(gObjectEventPic_Teala, 2, 4, 0), + overworld_frame(gObjectEventPic_Teala, 2, 4, 1), + overworld_frame(gObjectEventPic_Teala, 2, 4, 2), + overworld_frame(gObjectEventPic_Teala, 2, 4, 3), + overworld_frame(gObjectEventPic_Teala, 2, 4, 4), + overworld_frame(gObjectEventPic_Teala, 2, 4, 5), + overworld_frame(gObjectEventPic_Teala, 2, 4, 6), + overworld_frame(gObjectEventPic_Teala, 2, 4, 7), + overworld_frame(gObjectEventPic_Teala, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BreakableRock[] = { + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 0), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 1), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 2), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PushableBoulder[] = { + obj_frame_tiles(gObjectEventPic_PushableBoulder), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MrBrineysBoat[] = { + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Truck[] = { + obj_frame_tiles(gObjectEventPic_Truck), +}; + +const struct SpriteFrameImage gObjectEventPicTable_VigorothCarryingBox[] = { + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 0), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 0), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 0), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 1), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 2), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 1), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 2), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 1), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_VigorothFacingAway[] = { + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 3), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 3), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 3), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BirchsBag[] = { + obj_frame_tiles(gObjectEventPic_BirchsBag), +}; + +const struct SpriteFrameImage gObjectEventPicTable_EnemyZigzagoon[] = { + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 0), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 1), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 2), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 3), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 4), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 5), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 6), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 7), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Poochyena[] = { + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 0), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 1), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 2), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 3), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 4), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 5), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 6), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 7), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Artist[] = { + overworld_frame(gObjectEventPic_Artist, 2, 4, 0), + overworld_frame(gObjectEventPic_Artist, 2, 4, 1), + overworld_frame(gObjectEventPic_Artist, 2, 4, 2), + overworld_frame(gObjectEventPic_Artist, 2, 4, 3), + overworld_frame(gObjectEventPic_Artist, 2, 4, 4), + overworld_frame(gObjectEventPic_Artist, 2, 4, 5), + overworld_frame(gObjectEventPic_Artist, 2, 4, 6), + overworld_frame(gObjectEventPic_Artist, 2, 4, 7), + overworld_frame(gObjectEventPic_Artist, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayNormal[] = { + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 8), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 0), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 1), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 2), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 3), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 4), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 5), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 6), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 7), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayMachBike[] = { + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 0), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 1), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 2), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 3), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 4), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 5), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 6), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 7), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayAcroBike[] = { + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 0), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 1), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 2), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 3), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 4), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 5), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 6), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 7), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 8), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 9), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 10), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 11), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 12), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 13), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 14), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 15), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 16), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 17), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 18), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 19), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 20), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 21), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 22), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 23), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 24), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 25), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 26), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MaySurfing[] = { + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 1), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 3), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayUnderwater[] = { + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayFieldMove[] = { + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 0), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 1), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 2), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 3), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Cameraman[] = { + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 0), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 1), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 2), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 3), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 4), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 5), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 6), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 7), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MovingBox[] = { + obj_frame_tiles(gObjectEventPic_MovingBox), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CableCar[] = { + obj_frame_tiles(gObjectEventPic_CableCar), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scientist2[] = { + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 0), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 1), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 2), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 3), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 4), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 5), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 6), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 7), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DevonEmployee[] = { + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 0), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 1), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 2), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 3), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 4), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 5), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 6), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 7), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AquaMemberM[] = { + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 0), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 1), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 2), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 3), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 4), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 5), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 6), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 7), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AquaMemberF[] = { + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 0), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 1), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 2), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 3), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 4), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 5), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 6), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 7), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MagmaMemberM[] = { + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 0), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 1), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 2), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 3), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 4), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 5), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 6), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 7), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MagmaMemberF[] = { + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 0), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 1), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 2), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 3), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 4), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 5), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 6), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 7), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sidney[] = { + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Phoebe[] = { + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Glacia[] = { + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Drake[] = { + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Roxanne[] = { + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Brawly[] = { + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wattson[] = { + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Flannery[] = { + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Norman[] = { + overworld_frame(gObjectEventPic_Norman, 2, 4, 0), + overworld_frame(gObjectEventPic_Norman, 2, 4, 1), + overworld_frame(gObjectEventPic_Norman, 2, 4, 2), + overworld_frame(gObjectEventPic_Norman, 2, 4, 3), + overworld_frame(gObjectEventPic_Norman, 2, 4, 4), + overworld_frame(gObjectEventPic_Norman, 2, 4, 5), + overworld_frame(gObjectEventPic_Norman, 2, 4, 6), + overworld_frame(gObjectEventPic_Norman, 2, 4, 7), + overworld_frame(gObjectEventPic_Norman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Winona[] = { + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Liza[] = { + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Tate[] = { + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wallace[] = { + overworld_frame(gObjectEventPic_Wallace, 2, 4, 0), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 1), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 2), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 3), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 4), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 5), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 6), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 7), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Steven[] = { + overworld_frame(gObjectEventPic_Steven, 2, 4, 0), + overworld_frame(gObjectEventPic_Steven, 2, 4, 1), + overworld_frame(gObjectEventPic_Steven, 2, 4, 2), + overworld_frame(gObjectEventPic_Steven, 2, 4, 3), + overworld_frame(gObjectEventPic_Steven, 2, 4, 4), + overworld_frame(gObjectEventPic_Steven, 2, 4, 5), + overworld_frame(gObjectEventPic_Steven, 2, 4, 6), + overworld_frame(gObjectEventPic_Steven, 2, 4, 7), + overworld_frame(gObjectEventPic_Steven, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wally[] = { + overworld_frame(gObjectEventPic_Wally, 2, 4, 0), + overworld_frame(gObjectEventPic_Wally, 2, 4, 1), + overworld_frame(gObjectEventPic_Wally, 2, 4, 2), + overworld_frame(gObjectEventPic_Wally, 2, 4, 3), + overworld_frame(gObjectEventPic_Wally, 2, 4, 4), + overworld_frame(gObjectEventPic_Wally, 2, 4, 5), + overworld_frame(gObjectEventPic_Wally, 2, 4, 6), + overworld_frame(gObjectEventPic_Wally, 2, 4, 7), + overworld_frame(gObjectEventPic_Wally, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RubySapphireLittleBoy[] = { + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 0), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 1), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 2), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 3), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 4), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 5), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 6), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 7), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanFishing[] = { + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 8), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 9), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 10), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 11), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayFishing[] = { + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 0), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 1), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 2), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 3), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 4), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 5), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 6), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 7), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 8), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 9), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 10), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 11), +}; + +const struct SpriteFrameImage gObjectEventPicTable_HotSpringsOldWoman[] = { + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SSTidal[] = { + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SubmarineShadow[] = { + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PichuDoll[] = { + obj_frame_tiles(gObjectEventPic_PichuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikachuDoll[] = { + obj_frame_tiles(gObjectEventPic_PikachuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MarillDoll[] = { + obj_frame_tiles(gObjectEventPic_MarillDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TogepiDoll[] = { + obj_frame_tiles(gObjectEventPic_TogepiDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyndaquilDoll[] = { + obj_frame_tiles(gObjectEventPic_CyndaquilDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ChikoritaDoll[] = { + obj_frame_tiles(gObjectEventPic_ChikoritaDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TotodileDoll[] = { + obj_frame_tiles(gObjectEventPic_TotodileDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_JigglypuffDoll[] = { + obj_frame_tiles(gObjectEventPic_JigglypuffDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MeowthDoll[] = { + obj_frame_tiles(gObjectEventPic_MeowthDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ClefairyDoll[] = { + obj_frame_tiles(gObjectEventPic_ClefairyDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DittoDoll[] = { + obj_frame_tiles(gObjectEventPic_DittoDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SmoochumDoll[] = { + obj_frame_tiles(gObjectEventPic_SmoochumDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TreeckoDoll[] = { + obj_frame_tiles(gObjectEventPic_TreeckoDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TorchicDoll[] = { + obj_frame_tiles(gObjectEventPic_TorchicDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MudkipDoll[] = { + obj_frame_tiles(gObjectEventPic_MudkipDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DuskullDoll[] = { + obj_frame_tiles(gObjectEventPic_DuskullDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_WynautDoll[] = { + obj_frame_tiles(gObjectEventPic_WynautDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BaltoyDoll[] = { + obj_frame_tiles(gObjectEventPic_BaltoyDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KecleonDoll[] = { + obj_frame_tiles(gObjectEventPic_KecleonDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AzurillDoll[] = { + obj_frame_tiles(gObjectEventPic_AzurillDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SkittyDoll[] = { + obj_frame_tiles(gObjectEventPic_SkittyDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwabluDoll[] = { + obj_frame_tiles(gObjectEventPic_SwabluDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GulpinDoll[] = { + obj_frame_tiles(gObjectEventPic_GulpinDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LotadDoll[] = { + obj_frame_tiles(gObjectEventPic_LotadDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SeedotDoll[] = { + obj_frame_tiles(gObjectEventPic_SeedotDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikaCushion[] = { + obj_frame_tiles(gObjectEventPic_PikaCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RoundCushion[] = { + obj_frame_tiles(gObjectEventPic_RoundCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KissCushion[] = { + obj_frame_tiles(gObjectEventPic_KissCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ZigzagCushion[] = { + obj_frame_tiles(gObjectEventPic_ZigzagCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SpinCushion[] = { + obj_frame_tiles(gObjectEventPic_SpinCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DiamondCushion[] = { + obj_frame_tiles(gObjectEventPic_DiamondCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BallCushion[] = { + obj_frame_tiles(gObjectEventPic_BallCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GrassCushion[] = { + obj_frame_tiles(gObjectEventPic_GrassCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_FireCushion[] = { + obj_frame_tiles(gObjectEventPic_FireCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_WaterCushion[] = { + obj_frame_tiles(gObjectEventPic_WaterCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigSnorlaxDoll[] = { + obj_frame_tiles(gObjectEventPic_BigSnorlaxDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRhydonDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRhydonDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigLaprasDoll[] = { + obj_frame_tiles(gObjectEventPic_BigLaprasDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigVenusaurDoll[] = { + obj_frame_tiles(gObjectEventPic_BigVenusaurDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigCharizardDoll[] = { + obj_frame_tiles(gObjectEventPic_BigCharizardDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigBlastoiseDoll[] = { + obj_frame_tiles(gObjectEventPic_BigBlastoiseDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigWailmerDoll[] = { + obj_frame_tiles(gObjectEventPic_BigWailmerDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegirockDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRegirockDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegiceDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRegiceDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegisteelDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRegisteelDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LatiasLatios[] = { + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GameboyKid[] = { + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 0), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 1), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 2), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 0), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 0), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 1), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 1), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 2), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ContestJudge[] = { + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 0), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 1), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 2), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 3), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 4), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 5), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 6), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 7), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanWatering[] = { + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayWatering[] = { + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 0), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 2), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 4), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 5), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanDecorating[] = { + obj_frame_tiles(gObjectEventPic_BrendanDecorating), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayDecorating[] = { + obj_frame_tiles(gObjectEventPic_MayDecorating), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Archie[] = { + overworld_frame(gObjectEventPic_Archie, 2, 4, 0), + overworld_frame(gObjectEventPic_Archie, 2, 4, 1), + overworld_frame(gObjectEventPic_Archie, 2, 4, 2), + overworld_frame(gObjectEventPic_Archie, 2, 4, 3), + overworld_frame(gObjectEventPic_Archie, 2, 4, 4), + overworld_frame(gObjectEventPic_Archie, 2, 4, 5), + overworld_frame(gObjectEventPic_Archie, 2, 4, 6), + overworld_frame(gObjectEventPic_Archie, 2, 4, 7), + overworld_frame(gObjectEventPic_Archie, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Maxie[] = { + overworld_frame(gObjectEventPic_Maxie, 2, 4, 0), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 1), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 2), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 3), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 4), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 5), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 6), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 7), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KyogreFront[] = { + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GroudonFront[] = { + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KyogreSide[] = { + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GroudonSide[] = { + overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Fossil[] = { + obj_frame_tiles(gObjectEventPic_Fossil), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Regi[] = { + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Skitty[] = { + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Kecleon[] = { + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Rayquaza[] = { + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 0), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 1), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 2), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 3), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RayquazaStill[] = { + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Zigzagoon[] = { + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Pikachu[] = { + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Azumarill[] = { + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wingull[] = { + overworld_frame(gObjectEventPic_Wingull, 2, 2, 0), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 2), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 4), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 1), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 1), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 3), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 3), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 5), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberMSwimming[] = { + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Azurill[] = { + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Mom[] = { + overworld_frame(gObjectEventPic_Mom, 2, 4, 0), + overworld_frame(gObjectEventPic_Mom, 2, 4, 1), + overworld_frame(gObjectEventPic_Mom, 2, 4, 2), + overworld_frame(gObjectEventPic_Mom, 2, 4, 3), + overworld_frame(gObjectEventPic_Mom, 2, 4, 4), + overworld_frame(gObjectEventPic_Mom, 2, 4, 5), + overworld_frame(gObjectEventPic_Mom, 2, 4, 6), + overworld_frame(gObjectEventPic_Mom, 2, 4, 7), + overworld_frame(gObjectEventPic_Mom, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scott[] = { + overworld_frame(gObjectEventPic_Scott, 2, 4, 0), + overworld_frame(gObjectEventPic_Scott, 2, 4, 1), + overworld_frame(gObjectEventPic_Scott, 2, 4, 2), + overworld_frame(gObjectEventPic_Scott, 2, 4, 3), + overworld_frame(gObjectEventPic_Scott, 2, 4, 4), + overworld_frame(gObjectEventPic_Scott, 2, 4, 5), + overworld_frame(gObjectEventPic_Scott, 2, 4, 6), + overworld_frame(gObjectEventPic_Scott, 2, 4, 7), + overworld_frame(gObjectEventPic_Scott, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Juan[] = { + overworld_frame(gObjectEventPic_Juan, 2, 4, 0), + overworld_frame(gObjectEventPic_Juan, 2, 4, 1), + overworld_frame(gObjectEventPic_Juan, 2, 4, 2), + overworld_frame(gObjectEventPic_Juan, 2, 4, 3), + overworld_frame(gObjectEventPic_Juan, 2, 4, 4), + overworld_frame(gObjectEventPic_Juan, 2, 4, 5), + overworld_frame(gObjectEventPic_Juan, 2, 4, 6), + overworld_frame(gObjectEventPic_Juan, 2, 4, 7), + overworld_frame(gObjectEventPic_Juan, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MysteryEventDeliveryman[] = { + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 2), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 2), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Statue[] = { + obj_frame_tiles(gObjectEventPic_Statue), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Dusclops[] = { + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 0), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 1), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 2), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 3), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 4), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 5), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 6), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 7), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Kirlia[] = { + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 0), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 1), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 2), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 3), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 4), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 5), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 6), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 7), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnionRoomAttendant[] = { + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 2), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 2), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sudowoodo[] = { + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 1), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 1), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Mew[] = { + overworld_frame(gObjectEventPic_Mew, 2, 4, 0), + overworld_frame(gObjectEventPic_Mew, 2, 4, 1), + overworld_frame(gObjectEventPic_Mew, 2, 4, 2), + overworld_frame(gObjectEventPic_Mew, 2, 4, 3), + overworld_frame(gObjectEventPic_Mew, 2, 4, 4), + overworld_frame(gObjectEventPic_Mew, 2, 4, 5), + overworld_frame(gObjectEventPic_Mew, 2, 4, 6), + overworld_frame(gObjectEventPic_Mew, 2, 4, 7), + overworld_frame(gObjectEventPic_Mew, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Red[] = { + overworld_frame(gObjectEventPic_Red, 2, 4, 0), + overworld_frame(gObjectEventPic_Red, 2, 4, 1), + overworld_frame(gObjectEventPic_Red, 2, 4, 2), + overworld_frame(gObjectEventPic_Red, 2, 4, 3), + overworld_frame(gObjectEventPic_Red, 2, 4, 4), + overworld_frame(gObjectEventPic_Red, 2, 4, 5), + overworld_frame(gObjectEventPic_Red, 2, 4, 6), + overworld_frame(gObjectEventPic_Red, 2, 4, 7), + overworld_frame(gObjectEventPic_Red, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Leaf[] = { + overworld_frame(gObjectEventPic_Leaf, 2, 4, 0), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 1), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 2), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 3), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 4), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 5), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 6), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 7), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Deoxys[] = { + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 1), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 1), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BirthIslandStone[] = { + obj_frame_tiles(gObjectEventPic_BirthIslandStone), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Anabel[] = { + overworld_frame(gObjectEventPic_Anabel, 2, 4, 0), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 1), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 2), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 3), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 4), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 5), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 6), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 7), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Tucker[] = { + overworld_frame(gObjectEventPic_Tucker, 2, 4, 0), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 1), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 2), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 3), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 4), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 5), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 6), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 7), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Spenser[] = { + overworld_frame(gObjectEventPic_Spenser, 2, 4, 0), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 1), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 2), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 3), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 4), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 5), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 6), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 7), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Greta[] = { + overworld_frame(gObjectEventPic_Greta, 2, 4, 0), + overworld_frame(gObjectEventPic_Greta, 2, 4, 1), + overworld_frame(gObjectEventPic_Greta, 2, 4, 2), + overworld_frame(gObjectEventPic_Greta, 2, 4, 3), + overworld_frame(gObjectEventPic_Greta, 2, 4, 4), + overworld_frame(gObjectEventPic_Greta, 2, 4, 5), + overworld_frame(gObjectEventPic_Greta, 2, 4, 6), + overworld_frame(gObjectEventPic_Greta, 2, 4, 7), + overworld_frame(gObjectEventPic_Greta, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Noland[] = { + overworld_frame(gObjectEventPic_Noland, 2, 4, 0), + overworld_frame(gObjectEventPic_Noland, 2, 4, 1), + overworld_frame(gObjectEventPic_Noland, 2, 4, 2), + overworld_frame(gObjectEventPic_Noland, 2, 4, 3), + overworld_frame(gObjectEventPic_Noland, 2, 4, 4), + overworld_frame(gObjectEventPic_Noland, 2, 4, 5), + overworld_frame(gObjectEventPic_Noland, 2, 4, 6), + overworld_frame(gObjectEventPic_Noland, 2, 4, 7), + overworld_frame(gObjectEventPic_Noland, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Lucy[] = { + overworld_frame(gObjectEventPic_Lucy, 2, 4, 0), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 1), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 2), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 3), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 4), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 5), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 6), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 7), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Brandon[] = { + overworld_frame(gObjectEventPic_Brandon, 2, 4, 0), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 1), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 2), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 3), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 4), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 5), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 6), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 7), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Lugia[] = { + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_HoOh[] = { + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 1), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 1), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RubySapphireBrendan[] = { + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RubySapphireMay[] = { + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 8), +}; diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/event_object/event_object_subsprites.h similarity index 53% rename from src/data/field_event_obj/event_object_subsprites.h rename to src/data/event_object/event_object_subsprites.h index 5da2627319..3beccb4162 100755 --- a/src/data/field_event_obj/event_object_subsprites.h +++ b/src/data/event_object/event_object_subsprites.h @@ -1,102 +1,102 @@ -const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_0[] = { { -8, -8, 0, 1, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_1[] = { { -8, -8, 0, 1, 0, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_2[] = { { -8, -8, 1, 0, 0, 2}, { -8, 0, 1, 0, 2, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_3[] = { { -8, -8, 0, 1, 0, 2}, { -8, -8, 0, 1, 0, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_4[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_4[] = { { -8, -8, 0, 1, 0, 1}, { -8, -8, 0, 1, 0, 3} }; -const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_16x16[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_16x16_0}, - {1, gEventObjectSpriteOamTable_16x16_1}, - {2, gEventObjectSpriteOamTable_16x16_2}, - {2, gEventObjectSpriteOamTable_16x16_3}, - {2, gEventObjectSpriteOamTable_16x16_4} + {1, gObjectEventSpriteOamTable_16x16_0}, + {1, gObjectEventSpriteOamTable_16x16_1}, + {2, gObjectEventSpriteOamTable_16x16_2}, + {2, gObjectEventSpriteOamTable_16x16_3}, + {2, gObjectEventSpriteOamTable_16x16_4} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_0[] = { { -8, -16, 2, 2, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_1[] = { { -8, -16, 2, 2, 0, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_2[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 1, 0, 4, 2}, { -8, 8, 1, 0, 6, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_3[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 0, 1, 4, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_4[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_4[] = { { -8, -16, 0, 1, 0, 1}, { -8, 0, 0, 1, 4, 3} }; -const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_16x32[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_16x32_0}, - {1, gEventObjectSpriteOamTable_16x32_1}, - {3, gEventObjectSpriteOamTable_16x32_2}, - {2, gEventObjectSpriteOamTable_16x32_3}, - {2, gEventObjectSpriteOamTable_16x32_4} + {1, gObjectEventSpriteOamTable_16x32_0}, + {1, gObjectEventSpriteOamTable_16x32_1}, + {3, gObjectEventSpriteOamTable_16x32_2}, + {2, gObjectEventSpriteOamTable_16x32_3}, + {2, gObjectEventSpriteOamTable_16x32_4} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_0[] = { {-16, -16, 0, 2, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_1[] = { {-16, -16, 0, 2, 0, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_2[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 1, 8, 2}, {-16, 8, 1, 1, 12, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_3[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 2, 8, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_4[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_4[] = { {-16, -16, 1, 2, 0, 1}, {-16, 0, 1, 2, 8, 3} }; -const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_32x32[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_32x32_0}, - {1, gEventObjectSpriteOamTable_32x32_1}, - {3, gEventObjectSpriteOamTable_32x32_2}, - {2, gEventObjectSpriteOamTable_32x32_3}, - {2, gEventObjectSpriteOamTable_32x32_4} + {1, gObjectEventSpriteOamTable_32x32_0}, + {1, gObjectEventSpriteOamTable_32x32_1}, + {3, gObjectEventSpriteOamTable_32x32_2}, + {2, gObjectEventSpriteOamTable_32x32_3}, + {2, gObjectEventSpriteOamTable_32x32_4} }; -const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_Truck_0[] = { {-24, -24, 1, 1, 0, 2}, { 8, -24, 1, 0, 4, 2}, {-24, -16, 1, 1, 6, 2}, @@ -111,66 +111,66 @@ const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = { { 8, 16, 1, 0, 34, 2} }; -const struct SubspriteTable gEventObjectSpriteOamTables_Truck[] = { - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0} +const struct SubspriteTable gObjectEventSpriteOamTables_Truck[] = { + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0} }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_0[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_1[] = { {-32, -16, 1, 3, 0, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_2[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_3[] = { {-32, -16, 1, 3, 0, 2} }; -const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_Unused[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_Unused_0}, - {1, gEventObjectSpriteOamTable_Unused_1}, - {1, gEventObjectSpriteOamTable_Unused_2}, - {1, gEventObjectSpriteOamTable_Unused_3}, - {1, gEventObjectSpriteOamTable_Unused_3} + {1, gObjectEventSpriteOamTable_Unused_0}, + {1, gObjectEventSpriteOamTable_Unused_1}, + {1, gObjectEventSpriteOamTable_Unused_2}, + {1, gObjectEventSpriteOamTable_Unused_3}, + {1, gObjectEventSpriteOamTable_Unused_3} }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_0[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_1[] = { {-32, -32, 0, 3, 0, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_2[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_3[] = { {-32, -32, 0, 3, 0, 2} }; -const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_64x64[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_64x64_0}, - {1, gEventObjectSpriteOamTable_64x64_1}, - {1, gEventObjectSpriteOamTable_64x64_2}, - {1, gEventObjectSpriteOamTable_64x64_3}, - {1, gEventObjectSpriteOamTable_64x64_3} + {1, gObjectEventSpriteOamTable_64x64_0}, + {1, gObjectEventSpriteOamTable_64x64_1}, + {1, gObjectEventSpriteOamTable_64x64_2}, + {1, gObjectEventSpriteOamTable_64x64_3}, + {1, gObjectEventSpriteOamTable_64x64_3} }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -188,7 +188,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -206,7 +206,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = { { 16, 12, 1, 1, 56, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -224,7 +224,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -242,16 +242,16 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = { { 16, 12, 1, 1, 56, 2} }; -const struct SubspriteTable gEventObjectSpriteOamTables_SSTidal[] = { - {15, gEventObjectSpriteOamTable_SSTidal_0}, - {15, gEventObjectSpriteOamTable_SSTidal_0}, - {15, gEventObjectSpriteOamTable_SSTidal_1}, - {15, gEventObjectSpriteOamTable_SSTidal_2}, - {15, gEventObjectSpriteOamTable_SSTidal_3}, - {15, gEventObjectSpriteOamTable_SSTidal_3} +const struct SubspriteTable gObjectEventSpriteOamTables_SSTidal[] = { + {15, gObjectEventSpriteOamTable_SSTidal_0}, + {15, gObjectEventSpriteOamTable_SSTidal_0}, + {15, gObjectEventSpriteOamTable_SSTidal_1}, + {15, gObjectEventSpriteOamTable_SSTidal_2}, + {15, gObjectEventSpriteOamTable_SSTidal_3}, + {15, gObjectEventSpriteOamTable_SSTidal_3} }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -270,7 +270,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -289,7 +289,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = { { 32, 4, 0, 0, 43, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -308,7 +308,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -327,11 +327,11 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = { { 32, 4, 0, 0, 43, 2} }; -const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = { - {16, gEventObjectSpriteOamTable_SubmarineShadow_0}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_0}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_1}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_2}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_3}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_3} +const struct SubspriteTable gObjectEventSpriteOamTables_SubmarineShadow[] = { + {16, gObjectEventSpriteOamTable_SubmarineShadow_0}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_0}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_1}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_2}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_3}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_3} }; diff --git a/src/data/field_event_obj/field_effect_object_template_pointers.h b/src/data/event_object/field_effect_object_template_pointers.h similarity index 100% rename from src/data/field_event_obj/field_effect_object_template_pointers.h rename to src/data/event_object/field_effect_object_template_pointers.h diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/event_object/field_effect_objects.h similarity index 93% rename from src/data/field_event_obj/field_effect_objects.h rename to src/data/event_object/field_effect_objects.h index a3944de361..e47973dae9 100755 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/event_object/field_effect_objects.h @@ -29,13 +29,13 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = { overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0), @@ -60,7 +60,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] = gFieldEffectObjectImageAnim_850CA84, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = { overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0), @@ -88,7 +88,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] = gFieldEffectObjectImageAnim_850CAE0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = { overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0), @@ -113,7 +113,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] = gFieldEffectObjectImageAnim_850CB48, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = { overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 0), @@ -153,7 +153,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] = gSurfBlobAnim_FaceEast, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = { overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0), @@ -202,7 +202,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] = gFieldEffectObjectImageAnim_850CC40, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = { overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 0), @@ -223,7 +223,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] = gFieldEffectObjectImageAnim_850CC8C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = { overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 0), @@ -246,7 +246,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] = gFieldEffectObjectImageAnim_850CCD8, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = { overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0), @@ -286,7 +286,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] = gFieldEffectObjectImageAnim_850CD30, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = { overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0), @@ -326,7 +326,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[] gFieldEffectObjectImageAnim_850CD8C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = { overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 0), @@ -396,7 +396,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] = gFieldEffectObjectImageAnim_850CE18, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = { overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 0), @@ -419,7 +419,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] = gFieldEffectObjectImageAnim_850CE7C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = { overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0), @@ -452,7 +452,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] = gFieldEffectObjectImageAnim_850CEC8, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = { overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 0), @@ -473,7 +473,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[] gFieldEffectObjectImageAnim_850CF24, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = { overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 0), @@ -499,7 +499,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] = gFieldEffectObjectImageAnim_850CF70, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = { overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 0), @@ -526,7 +526,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] = gFieldEffectObjectImageAnim_850CFDC, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6), @@ -559,7 +559,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] = gFieldEffectObjectImageAnim_850D05C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = { overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 0), @@ -584,7 +584,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] = gFieldEffectObjectImageAnim_850D0C0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = { overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 0), @@ -607,7 +607,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] = gFieldEffectObjectImageAnim_850D118, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = { overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 0), @@ -628,7 +628,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] = gFieldEffectObjectImageAnim_850D160, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = { overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 0), @@ -653,7 +653,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown20[] = gFieldEffectObjectImageAnim_850D1AC, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] = { @@ -730,7 +730,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSpark gFieldEffectObjectImageAnim_850D2D4, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = { overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0), @@ -766,7 +766,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] = gFieldEffectObjectImageAnim_850D384, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = { overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0), @@ -802,7 +802,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] = gFieldEffectObjectImageAnim_850D404, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = { overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0), @@ -814,7 +814,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = { obj_frame_tiles(gFieldEffectObjectPic_Bird), @@ -831,7 +831,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] = gFieldEffectObjectImageAnim_850D49C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = { overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0), @@ -850,7 +850,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] = gFieldEffectObjectImageAnim_850D4D0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = { obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), @@ -867,7 +867,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] = gFieldEffectObjectImageAnim_850D500, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = { overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 0), @@ -892,7 +892,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] = gFieldEffectObjectImageAnim_850D54C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC}; const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D}; @@ -919,7 +919,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] = gFieldEffectObjectImageAnim_850D5B0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = { overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0), @@ -950,7 +950,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] = gFieldEffectObjectImageAnim_850D624, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = { overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 0), @@ -970,7 +970,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown35[] = gFieldEffectObjectImageAnim_850D674, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect}; const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F}; @@ -984,9 +984,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = { }; const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; -const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gEventObjectPalette2, 0x1011}; +const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gObjectEventPalette2, 0x1011}; diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/event_object/movement_action_func_tables.h similarity index 50% rename from src/data/field_event_obj/movement_action_func_tables.h rename to src/data/event_object/movement_action_func_tables.h index 8e136b58ba..8cf7d1699f 100755 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/event_object/movement_action_func_tables.h @@ -1,427 +1,427 @@ -u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PauseSpriteAnim(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Down_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Down_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Up_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Up_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Left_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Left_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Right_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Right_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay1_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Finish(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay2_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay4_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay8_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay16_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_StartAnimInDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WaitSpriteAnim(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_FacePlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_LockFacingDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DisableAnimation_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RestoreAnimation_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SetInvisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SetVisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteHeart_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RevealTrainer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RevealTrainer_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step2(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step2(struct EventObject *, struct Sprite *); -u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_HideReflection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ShowReflection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkLeftAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkLeftAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkRightAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkRightAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Figure8_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Figure8_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Levitate_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_StopLevitate_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Finish(struct EventObject *, struct Sprite *); -u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Fly_Finish(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_FaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PauseSpriteAnim(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Down_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Down_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Up_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Up_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Left_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Left_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Right_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Right_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay1_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Finish(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay2_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay4_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay8_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay16_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlow_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_StartAnimInDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WaitSpriteAnim(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FacePlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_LockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDownUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeftRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRightLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DisableAnimation_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RestoreAnimation_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetInvisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetVisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteExclamationMark_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ClearFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_InitAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ClearAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_HideReflection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ShowReflection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownStartAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkLeftAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkLeftAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkRightAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkRightAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Figure8_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Figure8_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Levitate_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_StopLevitate_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Finish(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Fly_Finish(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyDown_Step1(struct ObjectEvent *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_HideReflection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ShowReflection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Up[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Left[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Right[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay1[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay2[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay4[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay8[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay16[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FacePlayer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetInvisible[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetVisible[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_CutTree[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_HideReflection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ShowReflection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Levitate[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_StopLevitate[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Figure8[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FlyUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *); -u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = { +u8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *) = { [MOVEMENT_ACTION_FACE_DOWN] = gMovementActionFuncs_FaceDown, [MOVEMENT_ACTION_FACE_UP] = gMovementActionFuncs_FaceUp, [MOVEMENT_ACTION_FACE_LEFT] = gMovementActionFuncs_FaceLeft, @@ -582,22 +582,22 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) [MOVEMENT_ACTION_FLY_DOWN] = gMovementActionFuncs_FlyDown, }; -u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceDown_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceUp_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceLeft_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceRight_Step0, MovementAction_PauseSpriteAnim, }; @@ -610,97 +610,97 @@ u8 (*const gUnknown_0850DEE8[])(u8) = { GetMoveDirectionFastestAnimNum, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalUpLeft_Step0, MovementAction_WalkSlowDiagonalUpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalUpRight_Step0, MovementAction_WalkSlowDiagonalUpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalDownLeft_Step0, MovementAction_WalkSlowDiagonalDownLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalDownRight_Step0, MovementAction_WalkSlowDiagonalDownRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDown_Step0, MovementAction_WalkSlowDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowUp_Step0, MovementAction_WalkSlowUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowLeft_Step0, MovementAction_WalkSlowLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowRight_Step0, MovementAction_WalkSlowRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalUpLeft_Step0, MovementAction_WalkNormalDiagonalUpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalUpRight_Step0, MovementAction_WalkNormalDiagonalUpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalDownLeft_Step0, MovementAction_WalkNormalDiagonalDownLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalDownRight_Step0, MovementAction_WalkNormalDiagonalDownRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDown_Step0, MovementAction_WalkNormalDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalUp_Step0, MovementAction_WalkNormalUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalLeft_Step0, MovementAction_WalkNormalLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalRight_Step0, MovementAction_WalkNormalRight_Step1, MovementAction_PauseSpriteAnim, @@ -709,805 +709,805 @@ u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct const s16 gUnknown_0850DFBC[] = {0, 1, 1}; const s16 gUnknown_0850DFC2[] = {0, 0, 1}; -u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Down_Step0, MovementAction_Jump2Down_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Up[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Up_Step0, MovementAction_Jump2Up_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Left[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Left_Step0, MovementAction_Jump2Left_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Right[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Right_Step0, MovementAction_Jump2Right_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay1[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay1_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay2[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay2_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay4[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay4_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay8[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay8_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay16[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay16_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastDown_Step0, MovementAction_WalkFastDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastUp_Step0, MovementAction_WalkFastUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastLeft_Step0, MovementAction_WalkFastLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastRight_Step0, MovementAction_WalkFastRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowDown_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowUp_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowLeft_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowRight_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentDown_Step0, MovementAction_RideWaterCurrentDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentUp_Step0, MovementAction_RideWaterCurrentUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentLeft_Step0, MovementAction_RideWaterCurrentLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentRight_Step0, MovementAction_RideWaterCurrentRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestDown_Step0, MovementAction_WalkFastestDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestUp_Step0, MovementAction_WalkFastestUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestLeft_Step0, MovementAction_WalkFastestLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestRight_Step0, MovementAction_WalkFastestRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideDown_Step0, MovementAction_SlideDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideUp_Step0, MovementAction_SlideUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideLeft_Step0, MovementAction_SlideLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideRight_Step0, MovementAction_SlideRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunDown_Step0, MovementAction_PlayerRunDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunUp_Step0, MovementAction_PlayerRunUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunLeft_Step0, MovementAction_PlayerRunLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunRight_Step0, MovementAction_PlayerRunRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StartAnimInDirection_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialDown_Step0, MovementAction_JumpSpecialDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialUp_Step0, MovementAction_JumpSpecialUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialLeft_Step0, MovementAction_JumpSpecialLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialRight_Step0, MovementAction_JumpSpecialRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FacePlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FacePlayer_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceAwayPlayer_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_LockFacingDirection_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnlockFacingDirection_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpDown_Step0, MovementAction_JumpDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpUp_Step0, MovementAction_JumpUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpLeft_Step0, MovementAction_JumpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpRight_Step0, MovementAction_JumpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceDown_Step0, MovementAction_JumpInPlaceDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceUp_Step0, MovementAction_JumpInPlaceUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceLeft_Step0, MovementAction_JumpInPlaceLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceRight_Step0, MovementAction_JumpInPlaceRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceDownUp_Step0, MovementAction_JumpInPlaceDownUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceUpDown_Step0, MovementAction_JumpInPlaceUpDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceLeftRight_Step0, MovementAction_JumpInPlaceLeftRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceRightLeft_Step0, MovementAction_JumpInPlaceRightLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceOriginalDirection_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_NurseJoyBowDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EnableJumpLandingGroundEffect_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DisableJumpLandingGroundEffect_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DisableAnimation_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RestoreAnimation_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetInvisible[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetInvisible_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetVisible[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetVisible_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteExclamationMark_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteQuestionMark_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteHeart_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RevealTrainer_Step0, MovementAction_RevealTrainer_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RockSmashBreak_Step0, MovementAction_RockSmashBreak_Step1, MovementAction_RockSmashBreak_Step2, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_CutTree[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_CutTree_Step0, MovementAction_CutTree_Step1, MovementAction_CutTree_Step2, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetFixedPriority_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ClearFixedPriority_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_InitAffineAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ClearAffineAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_HideReflection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_HideReflection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_HideReflection_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_ShowReflection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ShowReflection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ShowReflection_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkDownStartAffine_Step0, MovementAction_WalkDownStartAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkDownAffine_Step0, MovementAction_WalkDownAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkLeftAffine_Step0, MovementAction_WalkLeftAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkRightAffine_Step0, MovementAction_WalkRightAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceDown_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceUp_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceLeft_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceRight_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Figure8[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Figure8_Step0, MovementAction_Figure8_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceDown_Step0, MovementAction_AcroWheelieHopFaceDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceUp_Step0, MovementAction_AcroWheelieHopFaceUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceLeft_Step0, MovementAction_AcroWheelieHopFaceLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceRight_Step0, MovementAction_AcroWheelieHopFaceRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopDown_Step0, MovementAction_AcroWheelieHopDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopUp_Step0, MovementAction_AcroWheelieHopUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopLeft_Step0, MovementAction_AcroWheelieHopLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopRight_Step0, MovementAction_AcroWheelieHopRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpDown_Step0, MovementAction_AcroWheelieJumpDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpUp_Step0, MovementAction_AcroWheelieJumpUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpLeft_Step0, MovementAction_AcroWheelieJumpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpRight_Step0, MovementAction_AcroWheelieJumpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveDown_Step0, MovementAction_AcroPopWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveUp_Step0, MovementAction_AcroPopWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveLeft_Step0, MovementAction_AcroPopWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveRight_Step0, MovementAction_AcroPopWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveDown_Step0, MovementAction_AcroWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveUp_Step0, MovementAction_AcroWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveLeft_Step0, MovementAction_AcroWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveRight_Step0, MovementAction_AcroWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveDown_Step0, MovementAction_AcroEndWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveUp_Step0, MovementAction_AcroEndWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveLeft_Step0, MovementAction_AcroEndWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveRight_Step0, MovementAction_AcroEndWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Levitate[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Levitate_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_StopLevitate[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StopLevitate_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DestroyExtraTaskIfAtTop_Step0, MovementAction_Finish, }; diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/event_object/movement_type_func_tables.h similarity index 80% rename from src/data/field_event_obj/movement_type_func_tables.h rename to src/data/event_object/movement_type_func_tables.h index 3c490011bf..7d149a6284 100755 --- a/src/data/field_event_obj/movement_type_func_tables.h +++ b/src/data/event_object/movement_type_func_tables.h @@ -1,4 +1,4 @@ -u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderAround[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderAround_Step0, MovementType_WanderAround_Step1, MovementType_WanderAround_Step2, @@ -24,7 +24,7 @@ u8 (*const gGetVectorDirectionFuncs[])(s16, s16, s16, s16) = { GetLimitedVectorDirection_SouthWestEast, }; -u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_LookAround[])(struct ObjectEvent *, struct Sprite *) = { MovementType_LookAround_Step0, MovementType_LookAround_Step1, MovementType_LookAround_Step2, @@ -32,7 +32,7 @@ u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite MovementType_LookAround_Step4, }; -u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderUpAndDown_Step0, MovementType_WanderUpAndDown_Step1, MovementType_WanderUpAndDown_Step2, @@ -44,7 +44,7 @@ u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sp const u8 gUpAndDownDirections[] = {DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderLeftAndRight_Step0, MovementType_WanderLeftAndRight_Step1, MovementType_WanderLeftAndRight_Step2, @@ -56,13 +56,13 @@ u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct const u8 gLeftAndRightDirections[] = {DIR_WEST, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDirection_Step0, MovementType_FaceDirection_Step1, MovementType_FaceDirection_Step2, }; -u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct ObjectEvent *, struct Sprite *) = { MovementType_BerryTreeGrowth_Step0, MovementType_BerryTreeGrowth_Step1, MovementType_BerryTreeGrowth_Step2, @@ -70,7 +70,7 @@ u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sp MovementType_BerryTreeGrowth_Step4, }; -u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndUp_Step0, MovementType_FaceDownAndUp_Step1, MovementType_FaceDownAndUp_Step2, @@ -78,7 +78,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Spri MovementType_FaceDownAndUp_Step4, }; -u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceLeftAndRight_Step0, MovementType_FaceLeftAndRight_Step1, MovementType_FaceLeftAndRight_Step2, @@ -86,7 +86,7 @@ u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct S MovementType_FaceLeftAndRight_Step4, }; -u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpAndLeft_Step0, MovementType_FaceUpAndLeft_Step1, MovementType_FaceUpAndLeft_Step2, @@ -96,7 +96,7 @@ u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Spri const u8 gUpAndLeftDirections[] = {DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpAndRight_Step0, MovementType_FaceUpAndRight_Step1, MovementType_FaceUpAndRight_Step2, @@ -106,7 +106,7 @@ u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Spr const u8 gUpAndRightDirections[] = {DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndLeft_Step0, MovementType_FaceDownAndLeft_Step1, MovementType_FaceDownAndLeft_Step2, @@ -116,7 +116,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sp const u8 gDownAndLeftDirections[] = {DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndRight_Step0, MovementType_FaceDownAndRight_Step1, MovementType_FaceDownAndRight_Step2, @@ -126,7 +126,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct S const u8 gDownAndRightDirections[] = {DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownUpAndLeft_Step0, MovementType_FaceDownUpAndLeft_Step1, MovementType_FaceDownUpAndLeft_Step2, @@ -136,7 +136,7 @@ u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct const u8 gDownUpAndLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownUpAndRight_Step0, MovementType_FaceDownUpAndRight_Step1, MovementType_FaceDownUpAndRight_Step2, @@ -146,7 +146,7 @@ u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct const u8 gDownUpAndRightDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpLeftAndRight_Step0, MovementType_FaceUpLeftAndRight_Step1, MovementType_FaceUpLeftAndRight_Step2, @@ -156,7 +156,7 @@ u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct const u8 gUpLeftAndRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownLeftAndRight_Step0, MovementType_FaceDownLeftAndRight_Step1, MovementType_FaceDownLeftAndRight_Step2, @@ -166,7 +166,7 @@ u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, stru const u8 gDownLeftAndRightDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RotateCounterclockwise_Step0, MovementType_RotateCounterclockwise_Step1, MovementType_RotateCounterclockwise_Step2, @@ -175,7 +175,7 @@ u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, st const u8 gCounterclockwiseDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RotateClockwise_Step0, MovementType_RotateClockwise_Step1, MovementType_RotateClockwise_Step2, @@ -184,14 +184,14 @@ u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sp const u8 gClockwiseDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkBackAndForth_Step0, MovementType_WalkBackAndForth_Step1, MovementType_WalkBackAndForth_Step2, MovementType_WalkBackAndForth_Step3, }; -u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpRightLeftDown_Step1, MovementType_WalkSequence_Step2, @@ -199,7 +199,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject const u8 gUpRightLeftDownDirections[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightLeftDownUp_Step1, MovementType_WalkSequence_Step2, @@ -207,7 +207,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject const u8 gRightLeftDownUpDirections[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownUpRightLeft_Step1, MovementType_WalkSequence_Step2, @@ -215,7 +215,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject const u8 gDownUpRightLeftDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftDownUpRight_Step1, MovementType_WalkSequence_Step2, @@ -223,7 +223,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject const u8 gLeftDownUpRightDirections[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpLeftRightDown_Step1, MovementType_WalkSequence_Step2, @@ -231,7 +231,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject const u8 gUpLeftRightDownDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftRightDownUp_Step1, MovementType_WalkSequence_Step2, @@ -239,13 +239,13 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject const u8 gLeftRightDownUpDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownUpLeftRight_Step1, MovementType_WalkSequence_Step2, }; -u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightDownUpLeft_Step1, MovementType_WalkSequence_Step2, @@ -253,7 +253,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject const u8 gRightDownUpLeftDirections[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftUpDownRight_Step1, MovementType_WalkSequence_Step2, @@ -261,7 +261,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject const u8 gLeftUpDownRightDirections[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpDownRightLeft_Step1, MovementType_WalkSequence_Step2, @@ -269,7 +269,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject const u8 gUpDownRightLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightLeftUpDown_Step1, MovementType_WalkSequence_Step2, @@ -277,7 +277,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject const u8 gRightLeftUpDownDirections[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownRightLeftUp_Step1, MovementType_WalkSequence_Step2, @@ -285,7 +285,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject const u8 gDownRightLeftUpDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightUpDownLeft_Step1, MovementType_WalkSequence_Step2, @@ -293,7 +293,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject const u8 gRightUpDownLeftDirections[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpDownLeftRight_Step1, MovementType_WalkSequence_Step2, @@ -301,7 +301,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject const u8 gUpDownLeftRightDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftRightUpDown_Step1, MovementType_WalkSequence_Step2, @@ -309,7 +309,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject const u8 gLeftRightUpDownDirections[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownLeftRightUp_Step1, MovementType_WalkSequence_Step2, @@ -317,7 +317,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject const u8 gDownLeftRightUpDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpLeftDownRight_Step1, MovementType_WalkSequence_Step2, @@ -325,7 +325,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject const u8 gUpLeftDownRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownRightUpLeft_Step1, MovementType_WalkSequence_Step2, @@ -333,7 +333,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject const u8 gDownRightUpLeftDirections[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftDownRightUp_Step1, MovementType_WalkSequence_Step2, @@ -341,7 +341,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject const u8 gLeftDownRightUpDirections[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightUpLeftDown_Step1, MovementType_WalkSequence_Step2, @@ -349,7 +349,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject const u8 gRightUpLeftDownDirections[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpRightDownLeft_Step1, MovementType_WalkSequence_Step2, @@ -357,7 +357,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject const u8 gUpRightDownLeftDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownLeftUpRight_Step1, MovementType_WalkSequence_Step2, @@ -365,7 +365,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject const u8 gDownLeftUpRightDirections[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftUpRightDown_Step1, MovementType_WalkSequence_Step2, @@ -373,7 +373,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject const u8 gLeftUpRightDownDirections[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightDownLeftUp_Step1, MovementType_WalkSequence_Step2, @@ -381,13 +381,13 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject const u8 gRightDownLeftUpDirections[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementType_CopyPlayer_Step0, MovementType_CopyPlayer_Step1, MovementType_CopyPlayer_Step2, }; -bool8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = { +bool8 (*const gCopyPlayerMovementFuncs[])(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)) = { CopyablePlayerMovement_None, CopyablePlayerMovement_FaceDirection, CopyablePlayerMovement_GoSpeed0, @@ -401,37 +401,37 @@ bool8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, CopyablePlayerMovement_None, }; -u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct ObjectEvent *, struct Sprite *) = { MovementType_CopyPlayer_Step0, MovementType_CopyPlayerInGrass_Step1, MovementType_CopyPlayer_Step2, }; -u8 (*const gMovementTypeFuncs_Hidden[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_Hidden[])(struct ObjectEvent *, struct Sprite *) = { MovementType_Hidden_Step0, }; -u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_WalkSlowlyInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSlowlyInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSlowlyInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_JogInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_JogInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_JogInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_RunInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RunInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RunInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_Invisible[])(struct ObjectEvent *, struct Sprite *) = { MovementType_Invisible_Step0, MovementType_Invisible_Step1, MovementType_Invisible_Step2, diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h deleted file mode 100755 index 27d5b1f9a1..0000000000 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ /dev/null @@ -1,565 +0,0 @@ -const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; - -const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; - -const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES}; - -const u8 gBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES}; - -const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { - [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CheriBerryTree, - [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ChestoBerryTree, - [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PechaBerryTree, - [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RawstBerryTree, - [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AspearBerryTree, - [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LeppaBerryTree, - [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_OranBerryTree, - [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PersimBerryTree, - [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LumBerryTree, - [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SitrusBerryTree, - [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_FigyBerryTree, - [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WikiBerryTree, - [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree, - [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree, - [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree, - [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree, - [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree, - [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree, - [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree, - [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree, - [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, - [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_KelpsyBerryTree, - [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree, - [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, - [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree, - [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_TamatoBerryTree, - [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree, - [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, - [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree, - [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_NomelBerryTree, - [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SpelonBerryTree, - [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PamtreBerryTree, - [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree, - [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree, - [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, - [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LiechiBerryTree, - [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, - [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree, - [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, - [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree, - [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LansatBerryTree, - [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree, - [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree, -}; - -const u8 *const gBerryTreePaletteSlotTablePointers[] = { - [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri, - [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto, - [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha, - [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst, - [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear, - [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa, - [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran, - [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim, - [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum, - [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus, - [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy, - [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki, - [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, - [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, - [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, - [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, - [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, - [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, - [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, - [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, - [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, - [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy, - [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, - [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, - [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, - [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato, - [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, - [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, - [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, - [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel, - [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon, - [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre, - [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, - [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, - [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, - [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi, - [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, - [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, - [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, - [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, - [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, - [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, - [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, -}; - -const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = { - [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - // 3 unused berries. - [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, -}; diff --git a/src/data/field_event_obj/event_object_anims.h b/src/data/field_event_obj/event_object_anims.h deleted file mode 100755 index 6203e0548f..0000000000 --- a/src/data/field_event_obj/event_object_anims.h +++ /dev/null @@ -1,1171 +0,0 @@ -const union AnimCmd gEventObjectImageAnim_StayStill[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceSouth[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceNorth[] = -{ - ANIMCMD_FRAME(1, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceWest[] = -{ - ANIMCMD_FRAME(2, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceEast[] = -{ - ANIMCMD_FRAME(2, 16, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoSouth[] = -{ - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(3, 8, .hFlip = TRUE), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoNorth[] = -{ - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(4, 8, .hFlip = TRUE), - ANIMCMD_FRAME(1, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoWest[] = -{ - ANIMCMD_FRAME(5, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(6, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoEast[] = -{ - ANIMCMD_FRAME(5, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_FRAME(6, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastSouth[] = -{ - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_FRAME(0, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastNorth[] = -{ - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(4, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastWest[] = -{ - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastEast[] = -{ - ANIMCMD_FRAME(5, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(6, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterSouth[] = -{ - ANIMCMD_FRAME(3, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(3, 2, .hFlip = TRUE), - ANIMCMD_FRAME(0, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterNorth[] = -{ - ANIMCMD_FRAME(4, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(4, 2, .hFlip = TRUE), - ANIMCMD_FRAME(1, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterWest[] = -{ - ANIMCMD_FRAME(5, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_FRAME(6, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterEast[] = -{ - ANIMCMD_FRAME(5, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_FRAME(6, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestSouth[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(3, 1, .hFlip = TRUE), - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestNorth[] = -{ - ANIMCMD_FRAME(4, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(4, 1, .hFlip = TRUE), - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestWest[] = -{ - ANIMCMD_FRAME(5, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_FRAME(6, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestEast[] = -{ - ANIMCMD_FRAME(5, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_FRAME(6, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceSouth[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceNorth[] = -{ - ANIMCMD_FRAME(1, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceWest[] = -{ - ANIMCMD_FRAME(2, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceEast[] = -{ - ANIMCMD_FRAME(2, 16, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoSouth[] = -{ - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoNorth[] = -{ - ANIMCMD_FRAME(5, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(6, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoWest[] = -{ - ANIMCMD_FRAME(7, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(8, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoEast[] = -{ - ANIMCMD_FRAME(7, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_FRAME(8, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastSouth[] = -{ - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastNorth[] = -{ - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastWest[] = -{ - ANIMCMD_FRAME(7, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastEast[] = -{ - ANIMCMD_FRAME(7, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(8, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterSouth[] = -{ - ANIMCMD_FRAME(3, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(4, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterNorth[] = -{ - ANIMCMD_FRAME(5, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(6, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterWest[] = -{ - ANIMCMD_FRAME(7, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_FRAME(8, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterEast[] = -{ - ANIMCMD_FRAME(7, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_FRAME(8, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestSouth[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(4, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestNorth[] = -{ - ANIMCMD_FRAME(5, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(6, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestWest[] = -{ - ANIMCMD_FRAME(7, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_FRAME(8, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestEast[] = -{ - ANIMCMD_FRAME(7, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_FRAME(8, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunSouth[] = -{ - ANIMCMD_FRAME(12, 5), - ANIMCMD_FRAME(9, 3), - ANIMCMD_FRAME(13, 5), - ANIMCMD_FRAME(9, 3), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunNorth[] = -{ - ANIMCMD_FRAME(14, 5), - ANIMCMD_FRAME(10, 3), - ANIMCMD_FRAME(15, 5), - ANIMCMD_FRAME(10, 3), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunWest[] = -{ - ANIMCMD_FRAME(16, 5), - ANIMCMD_FRAME(11, 3), - ANIMCMD_FRAME(17, 5), - ANIMCMD_FRAME(11, 3), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunEast[] = -{ - ANIMCMD_FRAME(16, 5, .hFlip = TRUE), - ANIMCMD_FRAME(11, 3, .hFlip = TRUE), - ANIMCMD_FRAME(17, 5, .hFlip = TRUE), - ANIMCMD_FRAME(11, 3, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FieldMove[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(4, 8), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobSouth[] = -{ - ANIMCMD_FRAME(9, 32), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobNorth[] = -{ - ANIMCMD_FRAME(10, 32), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobWest[] = -{ - ANIMCMD_FRAME(11, 32), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobEast[] = -{ - ANIMCMD_FRAME(11, 32, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelSouth[] = -{ - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelNorth[] = -{ - ANIMCMD_FRAME(13, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelWest[] = -{ - ANIMCMD_FRAME(17, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelEast[] = -{ - ANIMCMD_FRAME(17, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelSouth[] = -{ - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(12, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelNorth[] = -{ - ANIMCMD_FRAME(15, 4), - ANIMCMD_FRAME(16, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelWest[] = -{ - ANIMCMD_FRAME(19, 4), - ANIMCMD_FRAME(20, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelEast[] = -{ - ANIMCMD_FRAME(19, 4, .hFlip = TRUE), - ANIMCMD_FRAME(20, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelSouth[] = -{ - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelNorth[] = -{ - ANIMCMD_FRAME(13, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelWest[] = -{ - ANIMCMD_FRAME(17, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelEast[] = -{ - ANIMCMD_FRAME(17, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelSouth[] = -{ - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelNorth[] = -{ - ANIMCMD_FRAME(15, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelWest[] = -{ - ANIMCMD_FRAME(19, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelEast[] = -{ - ANIMCMD_FRAME(19, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieSouth[] = -{ - ANIMCMD_FRAME(21, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_FRAME(22, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieNorth[] = -{ - ANIMCMD_FRAME(23, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_FRAME(24, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieWest[] = -{ - ANIMCMD_FRAME(25, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_FRAME(26, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieEast[] = -{ - ANIMCMD_FRAME(25, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_FRAME(26, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage0[] = -{ - ANIMCMD_FRAME(0, 32), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(2, 32), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage2[] = -{ - ANIMCMD_FRAME(3, 48), - ANIMCMD_FRAME(4, 48), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage3[] = -{ - ANIMCMD_FRAME(5, 32), - ANIMCMD_FRAME(5, 32), - ANIMCMD_FRAME(6, 32), - ANIMCMD_FRAME(6, 32), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage4[] = -{ - ANIMCMD_FRAME(7, 48), - ANIMCMD_FRAME(7, 48), - ANIMCMD_FRAME(8, 48), - ANIMCMD_FRAME(8, 48), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_NurseBow[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(9, 32), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_RockBreak[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(3, 8), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TreeCut[] = -{ - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodSouth[] = -{ - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_FRAME(11, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodNorth[] = -{ - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(7, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodWest[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(3, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodEast[] = -{ - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodSouth[] = -{ - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(10, 6), - ANIMCMD_FRAME(9, 6), - ANIMCMD_FRAME(8, 6), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodNorth[] = -{ - ANIMCMD_FRAME(7, 4), - ANIMCMD_FRAME(6, 6), - ANIMCMD_FRAME(5, 6), - ANIMCMD_FRAME(4, 6), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodWest[] = -{ - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodEast[] = -{ - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4, .hFlip = TRUE), - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonSouth[] = -{ - ANIMCMD_FRAME(10, 6), - ANIMCMD_FRAME(11, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(11, 30), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonNorth[] = -{ - ANIMCMD_FRAME(6, 6), - ANIMCMD_FRAME(7, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(7, 30), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonWest[] = -{ - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(3, 30), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonEast[] = -{ - ANIMCMD_FRAME(2, 6, .hFlip = TRUE), - ANIMCMD_FRAME(3, 6, .hFlip = TRUE), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(3, 30, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8508FD8[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(7), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509008[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(15), - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(15), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509040[] = -{ - AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509050[] = -{ - AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509060[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), - AFFINEANIMCMD_LOOP(8), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509078[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_LOOP(8), - AFFINEANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_HoOhFlapWings[] = -{ - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HoOhStayStill[] = -{ - ANIMCMD_FRAME(3, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Inanimate[] = { - gEventObjectImageAnim_StayStill, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_QuintyPlump[] = { - gEventObjectImageAnim_QuintyPlumpFaceSouth, - gEventObjectImageAnim_QuintyPlumpFaceNorth, - gEventObjectImageAnim_QuintyPlumpFaceWest, - gEventObjectImageAnim_QuintyPlumpFaceEast, - gEventObjectImageAnim_QuintyPlumpGoSouth, - gEventObjectImageAnim_QuintyPlumpGoNorth, - gEventObjectImageAnim_QuintyPlumpGoWest, - gEventObjectImageAnim_QuintyPlumpGoEast, - gEventObjectImageAnim_QuintyPlumpGoFastSouth, - gEventObjectImageAnim_QuintyPlumpGoFastNorth, - gEventObjectImageAnim_QuintyPlumpGoFastWest, - gEventObjectImageAnim_QuintyPlumpGoFastEast, - gEventObjectImageAnim_QuintyPlumpGoFasterSouth, - gEventObjectImageAnim_QuintyPlumpGoFasterNorth, - gEventObjectImageAnim_QuintyPlumpGoFasterWest, - gEventObjectImageAnim_QuintyPlumpGoFasterEast, - gEventObjectImageAnim_QuintyPlumpGoFastestSouth, - gEventObjectImageAnim_QuintyPlumpGoFastestNorth, - gEventObjectImageAnim_QuintyPlumpGoFastestWest, - gEventObjectImageAnim_QuintyPlumpGoFastestEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Standard[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_HoOh[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_HoOhFlapWings, - gEventObjectImageAnim_HoOhStayStill, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Groudon3[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, -}; - -const union AnimCmd gEventObjectImageAnim_85091F0[] = -{ - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_85091F8[] = -{ - ANIMCMD_FRAME(4, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509200[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509208[] = -{ - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509210[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509218[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509220[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509228[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509230[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Rayquaza2[] = { - gEventObjectImageAnim_8509218, - gEventObjectImageAnim_8509220, - gEventObjectImageAnim_8509228, - gEventObjectImageAnim_8509230, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_8509208, - gEventObjectImageAnim_8509210, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_85091F0, - gEventObjectImageAnim_8509210, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_8509208, - gEventObjectImageAnim_8509210, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_8509208, - gEventObjectImageAnim_8509210, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BrendanMayNormal[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_RunSouth, - gEventObjectImageAnim_RunNorth, - gEventObjectImageAnim_RunWest, - gEventObjectImageAnim_RunEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_AcroBike[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_BunnyHoppyBackWheelSouth, - gEventObjectImageAnim_BunnyHoppyBackWheelNorth, - gEventObjectImageAnim_BunnyHoppyBackWheelWest, - gEventObjectImageAnim_BunnyHoppyBackWheelEast, - gEventObjectImageAnim_BunnyHoppyFrontWheelSouth, - gEventObjectImageAnim_BunnyHoppyFrontWheelNorth, - gEventObjectImageAnim_BunnyHoppyFrontWheelWest, - gEventObjectImageAnim_BunnyHoppyFrontWheelEast, - gEventObjectImageAnim_StandingWheelieBackWheelSouth, - gEventObjectImageAnim_StandingWheelieBackWheelNorth, - gEventObjectImageAnim_StandingWheelieBackWheelWest, - gEventObjectImageAnim_StandingWheelieBackWheelEast, - gEventObjectImageAnim_StandingWheelieFrontWheelSouth, - gEventObjectImageAnim_StandingWheelieFrontWheelNorth, - gEventObjectImageAnim_StandingWheelieFrontWheelWest, - gEventObjectImageAnim_StandingWheelieFrontWheelEast, - gEventObjectImageAnim_MovingWheelieSouth, - gEventObjectImageAnim_MovingWheelieNorth, - gEventObjectImageAnim_MovingWheelieWest, - gEventObjectImageAnim_MovingWheelieEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Surfing[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_GetOnOffSurfBlobSouth, - gEventObjectImageAnim_GetOnOffSurfBlobNorth, - gEventObjectImageAnim_GetOnOffSurfBlobWest, - gEventObjectImageAnim_GetOnOffSurfBlobEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Nurse[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_NurseBow, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_FieldMove[] = { - gEventObjectImageAnim_FieldMove, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BerryTree[] = { - gEventObjectImageAnim_BerryTreeStage0, - gEventObjectImageAnim_BerryTreeStage1, - gEventObjectImageAnim_BerryTreeStage2, - gEventObjectImageAnim_BerryTreeStage3, - gEventObjectImageAnim_BerryTreeStage4, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BreakableRock[] = { - gEventObjectImageAnim_StayStill, - gEventObjectImageAnim_RockBreak, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_CuttableTree[] = { - gEventObjectImageAnim_StayStill, - gEventObjectImageAnim_TreeCut, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Fishing[] = { - gEventObjectImageAnim_TakeOutRodSouth, - gEventObjectImageAnim_TakeOutRodNorth, - gEventObjectImageAnim_TakeOutRodWest, - gEventObjectImageAnim_TakeOutRodEast, - gEventObjectImageAnim_PutAwayRodSouth, - gEventObjectImageAnim_PutAwayRodNorth, - gEventObjectImageAnim_PutAwayRodWest, - gEventObjectImageAnim_PutAwayRodEast, - gEventObjectImageAnim_HookedPokemonSouth, - gEventObjectImageAnim_HookedPokemonNorth, - gEventObjectImageAnim_HookedPokemonWest, - gEventObjectImageAnim_HookedPokemonEast, -}; - -const union AffineAnimCmd *const gEventObjectRotScalAnimTable_KyogreGroudon[] = { - gEventObjectRotScalAnim_8508FD8, - gEventObjectRotScalAnim_8509008, - gEventObjectRotScalAnim_8509050, - gEventObjectRotScalAnim_8509040, - gEventObjectRotScalAnim_8509078, - gEventObjectRotScalAnim_8509060, -}; - -const struct UnkStruct_085094AC gUnknown_085094AC[] = { - { - .anims = gEventObjectImageAnimTable_QuintyPlump, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Standard, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_BrendanMayNormal, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_AcroBike, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Surfing, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Nurse, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Fishing, - .animPos = {1, 3, 0, 2}, - }, - { - NULL, - {0, 0, 0, 0}, - }, -}; diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h deleted file mode 100755 index 1f89cc98d4..0000000000 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ /dev/null @@ -1,245 +0,0 @@ -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xFFFF, EVENT_OBJ_PAL_TAG_12, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_NinjaBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Twin, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RichBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LinkReceptionist, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maniac, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HexManiac, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Beauty, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lass, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Gentleman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sailor, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Fisherman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Hiker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Nurse, gEventObjectPicTable_Nurse, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ItemBall, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, NULL, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_CuttableTree, gEventObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Teala, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BreakableRock, gEventObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck = {0xFFFF, EVENT_OBJ_PAL_TAG_14, EVENT_OBJ_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_Truck, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Truck, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_16, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena = {0xFFFF, EVENT_OBJ_PAL_TAG_27, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Poochyena, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Artist, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cameraman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xFFFF, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_DevonEmployee, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sidney, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Phoebe, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Glacia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Drake, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Roxanne, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brawly, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wattson, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Flannery, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Norman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Winona, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Liza, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tate, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wallace, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Steven, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wally, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_MayFishing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal = {0xFFFF, EVENT_OBJ_PAL_TAG_21, EVENT_OBJ_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SSTidal, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SSTidal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow = {0xFFFF, EVENT_OBJ_PAL_TAG_26, EVENT_OBJ_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SubmarineShadow, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KissCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BallCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_FireCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GameboyKid, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestJudge, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Archie, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maxie, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreSide, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Groudon3, gEventObjectPicTable_GroudonSide, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Fossil, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Skitty, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2 = {0xFFFF, EVENT_OBJ_PAL_TAG_22, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_24, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Rayquaza2, gEventObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azumarill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wingull, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_10, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azurill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mom, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Juan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scott, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Statue, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kirlia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Dusclops, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Red, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Leaf, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mew, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys = {0xFFFF, EVENT_OBJ_PAL_TAG_29, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Deoxys, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone = {0xFFFF, EVENT_OBJ_PAL_TAG_30, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Anabel, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tucker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Greta, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Spenser, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Noland, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lucy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brandon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_33, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay = {0xFFFF, EVENT_OBJ_PAL_TAG_34, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lugia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh = {0xFFFF, EVENT_OBJ_PAL_TAG_31, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_HoOh, gEventObjectPicTable_HoOh, gDummySpriteAffineAnimTable}; diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h deleted file mode 100755 index 661539d579..0000000000 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ /dev/null @@ -1,499 +0,0 @@ -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2; - - -const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = { - [EVENT_OBJ_GFX_BRENDAN_NORMAL] = &gEventObjectGraphicsInfo_BrendanNormal, - [EVENT_OBJ_GFX_BRENDAN_MACH_BIKE] = &gEventObjectGraphicsInfo_BrendanMachBike, - [EVENT_OBJ_GFX_BRENDAN_SURFING] = &gEventObjectGraphicsInfo_BrendanSurfing, - [EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE] = &gEventObjectGraphicsInfo_BrendanFieldMove, - [EVENT_OBJ_GFX_QUINTY_PLUMP] = &gEventObjectGraphicsInfo_QuintyPlump, - [EVENT_OBJ_GFX_NINJA_BOY] = &gEventObjectGraphicsInfo_NinjaBoy, - [EVENT_OBJ_GFX_TWIN] = &gEventObjectGraphicsInfo_Twin, - [EVENT_OBJ_GFX_BOY_1] = &gEventObjectGraphicsInfo_Boy1, - [EVENT_OBJ_GFX_GIRL_1] = &gEventObjectGraphicsInfo_Girl1, - [EVENT_OBJ_GFX_BOY_2] = &gEventObjectGraphicsInfo_Boy2, - [EVENT_OBJ_GFX_GIRL_2] = &gEventObjectGraphicsInfo_Girl2, - [EVENT_OBJ_GFX_LITTLE_BOY] = &gEventObjectGraphicsInfo_LittleBoy, - [EVENT_OBJ_GFX_LITTLE_GIRL] = &gEventObjectGraphicsInfo_LittleGirl, - [EVENT_OBJ_GFX_BOY_3] = &gEventObjectGraphicsInfo_Boy3, - [EVENT_OBJ_GFX_GIRL_3] = &gEventObjectGraphicsInfo_Girl3, - [EVENT_OBJ_GFX_RICH_BOY] = &gEventObjectGraphicsInfo_RichBoy, - [EVENT_OBJ_GFX_WOMAN_1] = &gEventObjectGraphicsInfo_Woman1, - [EVENT_OBJ_GFX_FAT_MAN] = &gEventObjectGraphicsInfo_FatMan, - [EVENT_OBJ_GFX_POKEFAN_F] = &gEventObjectGraphicsInfo_PokefanF, - [EVENT_OBJ_GFX_MAN_1] = &gEventObjectGraphicsInfo_Man1, - [EVENT_OBJ_GFX_WOMAN_2] = &gEventObjectGraphicsInfo_Woman2, - [EVENT_OBJ_GFX_EXPERT_M] = &gEventObjectGraphicsInfo_ExpertM, - [EVENT_OBJ_GFX_EXPERT_F] = &gEventObjectGraphicsInfo_ExpertF, - [EVENT_OBJ_GFX_MAN_2] = &gEventObjectGraphicsInfo_Man2, - [EVENT_OBJ_GFX_WOMAN_3] = &gEventObjectGraphicsInfo_Woman3, - [EVENT_OBJ_GFX_POKEFAN_M] = &gEventObjectGraphicsInfo_PokefanM, - [EVENT_OBJ_GFX_WOMAN_4] = &gEventObjectGraphicsInfo_Woman4, - [EVENT_OBJ_GFX_COOK] = &gEventObjectGraphicsInfo_Cook, - [EVENT_OBJ_GFX_LINK_RECEPTIONIST] = &gEventObjectGraphicsInfo_LinkReceptionist, - [EVENT_OBJ_GFX_OLD_MAN] = &gEventObjectGraphicsInfo_OldMan, - [EVENT_OBJ_GFX_OLD_WOMAN] = &gEventObjectGraphicsInfo_OldWoman, - [EVENT_OBJ_GFX_CAMPER] = &gEventObjectGraphicsInfo_Camper, - [EVENT_OBJ_GFX_PICNICKER] = &gEventObjectGraphicsInfo_Picnicker, - [EVENT_OBJ_GFX_MAN_3] = &gEventObjectGraphicsInfo_Man3, - [EVENT_OBJ_GFX_WOMAN_5] = &gEventObjectGraphicsInfo_Woman5, - [EVENT_OBJ_GFX_YOUNGSTER] = &gEventObjectGraphicsInfo_Youngster, - [EVENT_OBJ_GFX_BUG_CATCHER] = &gEventObjectGraphicsInfo_BugCatcher, - [EVENT_OBJ_GFX_PSYCHIC_M] = &gEventObjectGraphicsInfo_PsychicM, - [EVENT_OBJ_GFX_SCHOOL_KID_M] = &gEventObjectGraphicsInfo_SchoolKidM, - [EVENT_OBJ_GFX_MANIAC] = &gEventObjectGraphicsInfo_Maniac, - [EVENT_OBJ_GFX_HEX_MANIAC] = &gEventObjectGraphicsInfo_HexManiac, - [EVENT_OBJ_GFX_RAYQUAZA_1] = &gEventObjectGraphicsInfo_Rayquaza1, - [EVENT_OBJ_GFX_SWIMMER_M] = &gEventObjectGraphicsInfo_SwimmerM, - [EVENT_OBJ_GFX_SWIMMER_F] = &gEventObjectGraphicsInfo_SwimmerF, - [EVENT_OBJ_GFX_BLACK_BELT] = &gEventObjectGraphicsInfo_BlackBelt, - [EVENT_OBJ_GFX_BEAUTY] = &gEventObjectGraphicsInfo_Beauty, - [EVENT_OBJ_GFX_SCIENTIST_1] = &gEventObjectGraphicsInfo_Scientist1, - [EVENT_OBJ_GFX_LASS] = &gEventObjectGraphicsInfo_Lass, - [EVENT_OBJ_GFX_GENTLEMAN] = &gEventObjectGraphicsInfo_Gentleman, - [EVENT_OBJ_GFX_SAILOR] = &gEventObjectGraphicsInfo_Sailor, - [EVENT_OBJ_GFX_FISHERMAN] = &gEventObjectGraphicsInfo_Fisherman, - [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M] = &gEventObjectGraphicsInfo_RunningTriathleteM, - [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F] = &gEventObjectGraphicsInfo_RunningTriathleteF, - [EVENT_OBJ_GFX_TUBER_F] = &gEventObjectGraphicsInfo_TuberF, - [EVENT_OBJ_GFX_TUBER_M] = &gEventObjectGraphicsInfo_TuberM, - [EVENT_OBJ_GFX_HIKER] = &gEventObjectGraphicsInfo_Hiker, - [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M] = &gEventObjectGraphicsInfo_CyclingTriathleteM, - [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F] = &gEventObjectGraphicsInfo_CyclingTriathleteF, - [EVENT_OBJ_GFX_NURSE] = &gEventObjectGraphicsInfo_Nurse, - [EVENT_OBJ_GFX_ITEM_BALL] = &gEventObjectGraphicsInfo_ItemBall, - [EVENT_OBJ_GFX_BERRY_TREE] = &gEventObjectGraphicsInfo_BerryTree, - [EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES] = &gEventObjectGraphicsInfo_BerryTreeEarlyStages, - [EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES] = &gEventObjectGraphicsInfo_BerryTreeLateStages, - [EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE] = &gEventObjectGraphicsInfo_BrendanAcroBike, - [EVENT_OBJ_GFX_PROF_BIRCH] = &gEventObjectGraphicsInfo_ProfBirch, - [EVENT_OBJ_GFX_MAN_4] = &gEventObjectGraphicsInfo_Man4, - [EVENT_OBJ_GFX_MAN_5] = &gEventObjectGraphicsInfo_Man5, - [EVENT_OBJ_GFX_REPORTER_M] = &gEventObjectGraphicsInfo_ReporterM, - [EVENT_OBJ_GFX_REPORTER_F] = &gEventObjectGraphicsInfo_ReporterF, - [EVENT_OBJ_GFX_BARD] = &gEventObjectGraphicsInfo_Bard, - [EVENT_OBJ_GFX_ANABEL] = &gEventObjectGraphicsInfo_Anabel, - [EVENT_OBJ_GFX_TUCKER] = &gEventObjectGraphicsInfo_Tucker, - [EVENT_OBJ_GFX_GRETA] = &gEventObjectGraphicsInfo_Greta, - [EVENT_OBJ_GFX_SPENSER] = &gEventObjectGraphicsInfo_Spenser, - [EVENT_OBJ_GFX_NOLAND] = &gEventObjectGraphicsInfo_Noland, - [EVENT_OBJ_GFX_LUCY] = &gEventObjectGraphicsInfo_Lucy, - [EVENT_OBJ_GFX_UNUSED_NATU_DOLL] = &gEventObjectGraphicsInfo_UnusedNatuDoll, - [EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL] = &gEventObjectGraphicsInfo_UnusedMagnemiteDoll, - [EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL] = &gEventObjectGraphicsInfo_UnusedSquirtleDoll, - [EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL] = &gEventObjectGraphicsInfo_UnusedWooperDoll, - [EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_UnusedPikachuDoll, - [EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL] = &gEventObjectGraphicsInfo_UnusedPorygon2Doll, - [EVENT_OBJ_GFX_CUTTABLE_TREE] = &gEventObjectGraphicsInfo_CuttableTree, - [EVENT_OBJ_GFX_MART_EMPLOYEE] = &gEventObjectGraphicsInfo_MartEmployee, - [EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN] = &gEventObjectGraphicsInfo_RooftopSaleWoman, - [EVENT_OBJ_GFX_TEALA] = &gEventObjectGraphicsInfo_Teala, - [EVENT_OBJ_GFX_BREAKABLE_ROCK] = &gEventObjectGraphicsInfo_BreakableRock, - [EVENT_OBJ_GFX_PUSHABLE_BOULDER] = &gEventObjectGraphicsInfo_PushableBoulder, - [EVENT_OBJ_GFX_MR_BRINEYS_BOAT] = &gEventObjectGraphicsInfo_MrBrineysBoat, - [EVENT_OBJ_GFX_MAY_NORMAL] = &gEventObjectGraphicsInfo_MayNormal, - [EVENT_OBJ_GFX_MAY_MACH_BIKE] = &gEventObjectGraphicsInfo_MayMachBike, - [EVENT_OBJ_GFX_MAY_ACRO_BIKE] = &gEventObjectGraphicsInfo_MayAcroBike, - [EVENT_OBJ_GFX_MAY_SURFING] = &gEventObjectGraphicsInfo_MaySurfing, - [EVENT_OBJ_GFX_MAY_FIELD_MOVE] = &gEventObjectGraphicsInfo_MayFieldMove, - [EVENT_OBJ_GFX_TRUCK] = &gEventObjectGraphicsInfo_Truck, - [EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX] = &gEventObjectGraphicsInfo_VigorothCarryingBox, - [EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY] = &gEventObjectGraphicsInfo_VigorothFacingAway, - [EVENT_OBJ_GFX_BIRCHS_BAG] = &gEventObjectGraphicsInfo_BirchsBag, - [EVENT_OBJ_GFX_ZIGZAGOON_1] = &gEventObjectGraphicsInfo_EnemyZigzagoon, - [EVENT_OBJ_GFX_ARTIST] = &gEventObjectGraphicsInfo_Artist, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL] = &gEventObjectGraphicsInfo_RivalBrendanNormal, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gEventObjectGraphicsInfo_RivalBrendanMachBike, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gEventObjectGraphicsInfo_RivalBrendanAcroBike, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING] = &gEventObjectGraphicsInfo_RivalBrendanSurfing, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gEventObjectGraphicsInfo_RivalBrendanFieldMove, - [EVENT_OBJ_GFX_RIVAL_MAY_NORMAL] = &gEventObjectGraphicsInfo_RivalMayNormal, - [EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE] = &gEventObjectGraphicsInfo_RivalMayMachBike, - [EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE] = &gEventObjectGraphicsInfo_RivalMayAcroBike, - [EVENT_OBJ_GFX_RIVAL_MAY_SURFING] = &gEventObjectGraphicsInfo_RivalMaySurfing, - [EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE] = &gEventObjectGraphicsInfo_RivalMayFieldMove, - [EVENT_OBJ_GFX_CAMERAMAN] = &gEventObjectGraphicsInfo_Cameraman, - [EVENT_OBJ_GFX_BRENDAN_UNDERWATER] = &gEventObjectGraphicsInfo_BrendanUnderwater, - [EVENT_OBJ_GFX_MAY_UNDERWATER] = &gEventObjectGraphicsInfo_MayUnderwater, - [EVENT_OBJ_GFX_MOVING_BOX] = &gEventObjectGraphicsInfo_MovingBox, - [EVENT_OBJ_GFX_CABLE_CAR] = &gEventObjectGraphicsInfo_CableCar, - [EVENT_OBJ_GFX_SCIENTIST_2] = &gEventObjectGraphicsInfo_Scientist2, - [EVENT_OBJ_GFX_DEVON_EMPLOYEE] = &gEventObjectGraphicsInfo_DevonEmployee, - [EVENT_OBJ_GFX_AQUA_MEMBER_M] = &gEventObjectGraphicsInfo_AquaMemberM, - [EVENT_OBJ_GFX_AQUA_MEMBER_F] = &gEventObjectGraphicsInfo_AquaMemberF, - [EVENT_OBJ_GFX_MAGMA_MEMBER_M] = &gEventObjectGraphicsInfo_MagmaMemberM, - [EVENT_OBJ_GFX_MAGMA_MEMBER_F] = &gEventObjectGraphicsInfo_MagmaMemberF, - [EVENT_OBJ_GFX_SIDNEY] = &gEventObjectGraphicsInfo_Sidney, - [EVENT_OBJ_GFX_PHOEBE] = &gEventObjectGraphicsInfo_Phoebe, - [EVENT_OBJ_GFX_GLACIA] = &gEventObjectGraphicsInfo_Glacia, - [EVENT_OBJ_GFX_DRAKE] = &gEventObjectGraphicsInfo_Drake, - [EVENT_OBJ_GFX_ROXANNE] = &gEventObjectGraphicsInfo_Roxanne, - [EVENT_OBJ_GFX_BRAWLY] = &gEventObjectGraphicsInfo_Brawly, - [EVENT_OBJ_GFX_WATTSON] = &gEventObjectGraphicsInfo_Wattson, - [EVENT_OBJ_GFX_FLANNERY] = &gEventObjectGraphicsInfo_Flannery, - [EVENT_OBJ_GFX_NORMAN] = &gEventObjectGraphicsInfo_Norman, - [EVENT_OBJ_GFX_WINONA] = &gEventObjectGraphicsInfo_Winona, - [EVENT_OBJ_GFX_LIZA] = &gEventObjectGraphicsInfo_Liza, - [EVENT_OBJ_GFX_TATE] = &gEventObjectGraphicsInfo_Tate, - [EVENT_OBJ_GFX_WALLACE] = &gEventObjectGraphicsInfo_Wallace, - [EVENT_OBJ_GFX_STEVEN] = &gEventObjectGraphicsInfo_Steven, - [EVENT_OBJ_GFX_WALLY] = &gEventObjectGraphicsInfo_Wally, - [EVENT_OBJ_GFX_LITTLE_BOY_3] = &gEventObjectGraphicsInfo_RubySapphireLittleBoy, - [EVENT_OBJ_GFX_BRENDAN_FISHING] = &gEventObjectGraphicsInfo_BrendanFishing, - [EVENT_OBJ_GFX_MAY_FISHING] = &gEventObjectGraphicsInfo_MayFishing, - [EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN] = &gEventObjectGraphicsInfo_HotSpringsOldWoman, - [EVENT_OBJ_GFX_SS_TIDAL] = &gEventObjectGraphicsInfo_SSTidal, - [EVENT_OBJ_GFX_SUBMARINE_SHADOW] = &gEventObjectGraphicsInfo_SubmarineShadow, - [EVENT_OBJ_GFX_PICHU_DOLL] = &gEventObjectGraphicsInfo_PichuDoll, - [EVENT_OBJ_GFX_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_PikachuDoll, - [EVENT_OBJ_GFX_MARILL_DOLL] = &gEventObjectGraphicsInfo_MarillDoll, - [EVENT_OBJ_GFX_TOGEPI_DOLL] = &gEventObjectGraphicsInfo_TogepiDoll, - [EVENT_OBJ_GFX_CYNDAQUIL_DOLL] = &gEventObjectGraphicsInfo_CyndaquilDoll, - [EVENT_OBJ_GFX_CHIKORITA_DOLL] = &gEventObjectGraphicsInfo_ChikoritaDoll, - [EVENT_OBJ_GFX_TOTODILE_DOLL] = &gEventObjectGraphicsInfo_TotodileDoll, - [EVENT_OBJ_GFX_JIGGLYPUFF_DOLL] = &gEventObjectGraphicsInfo_JigglypuffDoll, - [EVENT_OBJ_GFX_MEOWTH_DOLL] = &gEventObjectGraphicsInfo_MeowthDoll, - [EVENT_OBJ_GFX_CLEFAIRY_DOLL] = &gEventObjectGraphicsInfo_ClefairyDoll, - [EVENT_OBJ_GFX_DITTO_DOLL] = &gEventObjectGraphicsInfo_DittoDoll, - [EVENT_OBJ_GFX_SMOOCHUM_DOLL] = &gEventObjectGraphicsInfo_SmoochumDoll, - [EVENT_OBJ_GFX_TREECKO_DOLL] = &gEventObjectGraphicsInfo_TreeckoDoll, - [EVENT_OBJ_GFX_TORCHIC_DOLL] = &gEventObjectGraphicsInfo_TorchicDoll, - [EVENT_OBJ_GFX_MUDKIP_DOLL] = &gEventObjectGraphicsInfo_MudkipDoll, - [EVENT_OBJ_GFX_DUSKULL_DOLL] = &gEventObjectGraphicsInfo_DuskullDoll, - [EVENT_OBJ_GFX_WYNAUT_DOLL] = &gEventObjectGraphicsInfo_WynautDoll, - [EVENT_OBJ_GFX_BALTOY_DOLL] = &gEventObjectGraphicsInfo_BaltoyDoll, - [EVENT_OBJ_GFX_KECLEON_DOLL] = &gEventObjectGraphicsInfo_KecleonDoll, - [EVENT_OBJ_GFX_AZURILL_DOLL] = &gEventObjectGraphicsInfo_AzurillDoll, - [EVENT_OBJ_GFX_SKITTY_DOLL] = &gEventObjectGraphicsInfo_SkittyDoll, - [EVENT_OBJ_GFX_SWABLU_DOLL] = &gEventObjectGraphicsInfo_SwabluDoll, - [EVENT_OBJ_GFX_GULPIN_DOLL] = &gEventObjectGraphicsInfo_GulpinDoll, - [EVENT_OBJ_GFX_LOTAD_DOLL] = &gEventObjectGraphicsInfo_LotadDoll, - [EVENT_OBJ_GFX_SEEDOT_DOLL] = &gEventObjectGraphicsInfo_SeedotDoll, - [EVENT_OBJ_GFX_PIKA_CUSHION] = &gEventObjectGraphicsInfo_PikaCushion, - [EVENT_OBJ_GFX_ROUND_CUSHION] = &gEventObjectGraphicsInfo_RoundCushion, - [EVENT_OBJ_GFX_KISS_CUSHION] = &gEventObjectGraphicsInfo_KissCushion, - [EVENT_OBJ_GFX_ZIGZAG_CUSHION] = &gEventObjectGraphicsInfo_ZigzagCushion, - [EVENT_OBJ_GFX_SPIN_CUSHION] = &gEventObjectGraphicsInfo_SpinCushion, - [EVENT_OBJ_GFX_DIAMOND_CUSHION] = &gEventObjectGraphicsInfo_DiamondCushion, - [EVENT_OBJ_GFX_BALL_CUSHION] = &gEventObjectGraphicsInfo_BallCushion, - [EVENT_OBJ_GFX_GRASS_CUSHION] = &gEventObjectGraphicsInfo_GrassCushion, - [EVENT_OBJ_GFX_FIRE_CUSHION] = &gEventObjectGraphicsInfo_FireCushion, - [EVENT_OBJ_GFX_WATER_CUSHION] = &gEventObjectGraphicsInfo_WaterCushion, - [EVENT_OBJ_GFX_BIG_SNORLAX_DOLL] = &gEventObjectGraphicsInfo_BigSnorlaxDoll, - [EVENT_OBJ_GFX_BIG_RHYDON_DOLL] = &gEventObjectGraphicsInfo_BigRhydonDoll, - [EVENT_OBJ_GFX_BIG_LAPRAS_DOLL] = &gEventObjectGraphicsInfo_BigLaprasDoll, - [EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL] = &gEventObjectGraphicsInfo_BigVenusaurDoll, - [EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL] = &gEventObjectGraphicsInfo_BigCharizardDoll, - [EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL] = &gEventObjectGraphicsInfo_BigBlastoiseDoll, - [EVENT_OBJ_GFX_BIG_WAILMER_DOLL] = &gEventObjectGraphicsInfo_BigWailmerDoll, - [EVENT_OBJ_GFX_BIG_REGIROCK_DOLL] = &gEventObjectGraphicsInfo_BigRegirockDoll, - [EVENT_OBJ_GFX_BIG_REGICE_DOLL] = &gEventObjectGraphicsInfo_BigRegiceDoll, - [EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL] = &gEventObjectGraphicsInfo_BigRegisteelDoll, - [EVENT_OBJ_GFX_LATIAS] = &gEventObjectGraphicsInfo_Latias, - [EVENT_OBJ_GFX_LATIOS] = &gEventObjectGraphicsInfo_Latios, - [EVENT_OBJ_GFX_GAMEBOY_KID] = &gEventObjectGraphicsInfo_GameboyKid, - [EVENT_OBJ_GFX_CONTEST_JUDGE] = &gEventObjectGraphicsInfo_ContestJudge, - [EVENT_OBJ_GFX_BRENDAN_WATERING] = &gEventObjectGraphicsInfo_BrendanWatering, - [EVENT_OBJ_GFX_MAY_WATERING] = &gEventObjectGraphicsInfo_MayWatering, - [EVENT_OBJ_GFX_BRENDAN_DECORATING] = &gEventObjectGraphicsInfo_BrendanDecorating, - [EVENT_OBJ_GFX_MAY_DECORATING] = &gEventObjectGraphicsInfo_MayDecorating, - [EVENT_OBJ_GFX_ARCHIE] = &gEventObjectGraphicsInfo_Archie, - [EVENT_OBJ_GFX_MAXIE] = &gEventObjectGraphicsInfo_Maxie, - [EVENT_OBJ_GFX_KYOGRE_1] = &gEventObjectGraphicsInfo_Kyogre1, - [EVENT_OBJ_GFX_GROUDON_1] = &gEventObjectGraphicsInfo_Groudon1, - [EVENT_OBJ_GFX_FOSSIL] = &gEventObjectGraphicsInfo_Fossil, - [EVENT_OBJ_GFX_REGIROCK] = &gEventObjectGraphicsInfo_Regirock, - [EVENT_OBJ_GFX_REGICE] = &gEventObjectGraphicsInfo_Regice, - [EVENT_OBJ_GFX_REGISTEEL] = &gEventObjectGraphicsInfo_Registeel, - [EVENT_OBJ_GFX_SKITTY] = &gEventObjectGraphicsInfo_Skitty, - [EVENT_OBJ_GFX_KECLEON_1] = &gEventObjectGraphicsInfo_Kecleon1, - [EVENT_OBJ_GFX_KYOGRE_2] = &gEventObjectGraphicsInfo_Kyogre2, - [EVENT_OBJ_GFX_GROUDON_2] = &gEventObjectGraphicsInfo_Groudon2, - [EVENT_OBJ_GFX_RAYQUAZA_2] = &gEventObjectGraphicsInfo_Rayquaza2, - [EVENT_OBJ_GFX_ZIGZAGOON_2] = &gEventObjectGraphicsInfo_Zigzagoon, - [EVENT_OBJ_GFX_PIKACHU] = &gEventObjectGraphicsInfo_Pikachu, - [EVENT_OBJ_GFX_AZUMARILL] = &gEventObjectGraphicsInfo_Azumarill, - [EVENT_OBJ_GFX_WINGULL] = &gEventObjectGraphicsInfo_Wingull, - [EVENT_OBJ_GFX_KECLEON_2] = &gEventObjectGraphicsInfo_Kecleon2, - [EVENT_OBJ_GFX_TUBER_M_SWIMMING] = &gEventObjectGraphicsInfo_TuberMSwimming, - [EVENT_OBJ_GFX_AZURILL] = &gEventObjectGraphicsInfo_Azurill, - [EVENT_OBJ_GFX_MOM] = &gEventObjectGraphicsInfo_Mom, - [EVENT_OBJ_GFX_LINK_BRENDAN] = &gEventObjectGraphicsInfo_LinkBrendan, - [EVENT_OBJ_GFX_LINK_MAY] = &gEventObjectGraphicsInfo_LinkMay, - [EVENT_OBJ_GFX_JUAN] = &gEventObjectGraphicsInfo_Juan, - [EVENT_OBJ_GFX_SCOTT] = &gEventObjectGraphicsInfo_Scott, - [EVENT_OBJ_GFX_POOCHYENA] = &gEventObjectGraphicsInfo_Poochyena, - [EVENT_OBJ_GFX_KYOGRE_3] = &gEventObjectGraphicsInfo_Kyogre3, - [EVENT_OBJ_GFX_GROUDON_3] = &gEventObjectGraphicsInfo_Groudon3, - [EVENT_OBJ_GFX_MYSTERY_GIFT_MAN] = &gEventObjectGraphicsInfo_MysteryEventDeliveryman, - [EVENT_OBJ_GFX_TRICK_HOUSE_STATUE] = &gEventObjectGraphicsInfo_Statue, - [EVENT_OBJ_GFX_KIRLIA] = &gEventObjectGraphicsInfo_Kirlia, - [EVENT_OBJ_GFX_DUSCLOPS] = &gEventObjectGraphicsInfo_Dusclops, - [EVENT_OBJ_GFX_UNION_ROOM_NURSE] = &gEventObjectGraphicsInfo_UnionRoomAttendant, - [EVENT_OBJ_GFX_SUDOWOODO] = &gEventObjectGraphicsInfo_Sudowoodo, - [EVENT_OBJ_GFX_MEW] = &gEventObjectGraphicsInfo_Mew, - [EVENT_OBJ_GFX_RED] = &gEventObjectGraphicsInfo_Red, - [EVENT_OBJ_GFX_LEAF] = &gEventObjectGraphicsInfo_Leaf, - [EVENT_OBJ_GFX_DEOXYS] = &gEventObjectGraphicsInfo_Deoxys, - [EVENT_OBJ_GFX_DEOXYS_TRIANGLE] = &gEventObjectGraphicsInfo_BirthIslandStone, - [EVENT_OBJ_GFX_BRANDON] = &gEventObjectGraphicsInfo_Brandon, - [EVENT_OBJ_GFX_LINK_RS_BRENDAN] = &gEventObjectGraphicsInfo_RubySapphireBrendan, - [EVENT_OBJ_GFX_LINK_RS_MAY] = &gEventObjectGraphicsInfo_RubySapphireMay, - [EVENT_OBJ_GFX_LUGIA] = &gEventObjectGraphicsInfo_Lugia, - [EVENT_OBJ_GFX_HOOH] = &gEventObjectGraphicsInfo_HoOh, -}; - -const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { - [MAUVILLE_MAN_BARD] = &gEventObjectGraphicsInfo_Bard, - [MAUVILLE_MAN_HIPSTER] = &gEventObjectGraphicsInfo_Hipster, - [MAUVILLE_MAN_TRADER] = &gEventObjectGraphicsInfo_Trader, - [MAUVILLE_MAN_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller, - [MAUVILLE_MAN_GIDDY] = &gEventObjectGraphicsInfo_Giddy, - [MAUVILLE_MAN_UNUSED1] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, - [MAUVILLE_MAN_UNUSED2] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, -}; diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h deleted file mode 100755 index 5c8be195d3..0000000000 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ /dev/null @@ -1,2174 +0,0 @@ -const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = { - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 8), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 0), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 1), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 2), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 3), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 4), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 5), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 6), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 7), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = { - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = { - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 8), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 9), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 10), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 11), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 12), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 13), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 14), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 15), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 16), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 17), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 18), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 19), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 20), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 21), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 22), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 23), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 24), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 25), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 26), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = { - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = { - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = { - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = { - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 0), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 1), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 2), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 3), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 4), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 5), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 6), -}; - -const struct SpriteFrameImage gEventObjectPicTable_NinjaBoy[] = { - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 0), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 1), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 2), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 3), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 4), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 5), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 6), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 7), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Twin[] = { - overworld_frame(gEventObjectPic_Twin, 2, 4, 0), - overworld_frame(gEventObjectPic_Twin, 2, 4, 1), - overworld_frame(gEventObjectPic_Twin, 2, 4, 2), - overworld_frame(gEventObjectPic_Twin, 2, 4, 3), - overworld_frame(gEventObjectPic_Twin, 2, 4, 4), - overworld_frame(gEventObjectPic_Twin, 2, 4, 5), - overworld_frame(gEventObjectPic_Twin, 2, 4, 6), - overworld_frame(gEventObjectPic_Twin, 2, 4, 7), - overworld_frame(gEventObjectPic_Twin, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = { - overworld_frame(gEventObjectPic_Boy1, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = { - overworld_frame(gEventObjectPic_Girl1, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = { - overworld_frame(gEventObjectPic_Boy2, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = { - overworld_frame(gEventObjectPic_Girl2, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleBoy[] = { - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleGirl[] = { - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = { - overworld_frame(gEventObjectPic_Boy3, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = { - overworld_frame(gEventObjectPic_Girl3, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RichBoy[] = { - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 0), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 1), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 2), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 3), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 4), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 5), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 6), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 7), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { - overworld_frame(gEventObjectPic_Woman1, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = { - overworld_frame(gEventObjectPic_FatMan, 2, 4, 0), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 1), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 2), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 3), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 4), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 5), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 6), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 7), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PokefanF[] = { - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 0), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 1), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 2), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 3), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 4), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 5), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 6), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 7), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { - overworld_frame(gEventObjectPic_Man1, 2, 4, 0), - overworld_frame(gEventObjectPic_Man1, 2, 4, 1), - overworld_frame(gEventObjectPic_Man1, 2, 4, 2), - overworld_frame(gEventObjectPic_Man1, 2, 4, 3), - overworld_frame(gEventObjectPic_Man1, 2, 4, 4), - overworld_frame(gEventObjectPic_Man1, 2, 4, 5), - overworld_frame(gEventObjectPic_Man1, 2, 4, 6), - overworld_frame(gEventObjectPic_Man1, 2, 4, 7), - overworld_frame(gEventObjectPic_Man1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { - overworld_frame(gEventObjectPic_Woman2, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ExpertM[] = { - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 0), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 1), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 2), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 3), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 4), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 5), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 6), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 7), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ExpertF[] = { - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 0), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 1), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 2), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 3), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 4), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 5), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 6), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 7), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { - overworld_frame(gEventObjectPic_Man2, 2, 4, 0), - overworld_frame(gEventObjectPic_Man2, 2, 4, 1), - overworld_frame(gEventObjectPic_Man2, 2, 4, 2), - overworld_frame(gEventObjectPic_Man2, 2, 4, 3), - overworld_frame(gEventObjectPic_Man2, 2, 4, 4), - overworld_frame(gEventObjectPic_Man2, 2, 4, 5), - overworld_frame(gEventObjectPic_Man2, 2, 4, 6), - overworld_frame(gEventObjectPic_Man2, 2, 4, 7), - overworld_frame(gEventObjectPic_Man2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { - overworld_frame(gEventObjectPic_Woman3, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PokefanM[] = { - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 0), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 1), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 2), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 3), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 4), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 5), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 6), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 7), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { - overworld_frame(gEventObjectPic_Woman4, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LinkReceptionist[] = { - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 0), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 1), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 2), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 3), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 4), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 5), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 6), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 7), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldMan[] = { - overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldWoman[] = { - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Camper[] = { - overworld_frame(gEventObjectPic_Camper, 2, 4, 0), - overworld_frame(gEventObjectPic_Camper, 2, 4, 1), - overworld_frame(gEventObjectPic_Camper, 2, 4, 2), - overworld_frame(gEventObjectPic_Camper, 2, 4, 3), - overworld_frame(gEventObjectPic_Camper, 2, 4, 4), - overworld_frame(gEventObjectPic_Camper, 2, 4, 5), - overworld_frame(gEventObjectPic_Camper, 2, 4, 6), - overworld_frame(gEventObjectPic_Camper, 2, 4, 7), - overworld_frame(gEventObjectPic_Camper, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = { - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 0), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 1), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 2), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 3), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 4), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 5), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 6), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 7), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { - overworld_frame(gEventObjectPic_Man3, 2, 4, 0), - overworld_frame(gEventObjectPic_Man3, 2, 4, 1), - overworld_frame(gEventObjectPic_Man3, 2, 4, 2), - overworld_frame(gEventObjectPic_Man3, 2, 4, 3), - overworld_frame(gEventObjectPic_Man3, 2, 4, 4), - overworld_frame(gEventObjectPic_Man3, 2, 4, 5), - overworld_frame(gEventObjectPic_Man3, 2, 4, 6), - overworld_frame(gEventObjectPic_Man3, 2, 4, 7), - overworld_frame(gEventObjectPic_Man3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { - overworld_frame(gEventObjectPic_Woman5, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = { - overworld_frame(gEventObjectPic_Youngster, 2, 4, 0), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 1), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 2), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 3), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 4), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 5), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 6), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 7), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = { - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 0), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 1), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 2), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 3), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 4), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 5), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 6), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 7), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = { - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 0), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 1), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 2), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 3), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 4), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 5), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 6), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 7), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = { - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 0), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 1), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 2), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 3), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 4), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 5), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 6), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 7), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = { - overworld_frame(gEventObjectPic_Maniac, 2, 4, 0), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 1), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 2), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 3), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 4), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 5), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 6), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 7), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = { - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 0), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 1), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 2), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 3), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 4), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 5), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 6), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 7), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = { - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 0), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 1), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 2), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 3), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 4), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 5), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 6), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 7), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = { - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 0), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 1), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 2), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 3), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 4), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 5), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 6), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 7), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = { - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 0), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 1), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 2), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 3), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 4), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 5), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 6), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 7), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = { - overworld_frame(gEventObjectPic_Beauty, 2, 4, 0), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 1), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 2), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 3), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 4), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 5), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 6), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 7), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = { - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 0), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 1), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 2), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 3), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 4), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 5), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 6), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 7), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Lass[] = { - overworld_frame(gEventObjectPic_Lass, 2, 4, 0), - overworld_frame(gEventObjectPic_Lass, 2, 4, 1), - overworld_frame(gEventObjectPic_Lass, 2, 4, 2), - overworld_frame(gEventObjectPic_Lass, 2, 4, 3), - overworld_frame(gEventObjectPic_Lass, 2, 4, 4), - overworld_frame(gEventObjectPic_Lass, 2, 4, 5), - overworld_frame(gEventObjectPic_Lass, 2, 4, 6), - overworld_frame(gEventObjectPic_Lass, 2, 4, 7), - overworld_frame(gEventObjectPic_Lass, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = { - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 0), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 1), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 2), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 3), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 4), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 5), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 6), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 7), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = { - overworld_frame(gEventObjectPic_Sailor, 2, 4, 0), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 1), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 2), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 3), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 4), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 5), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 6), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 7), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = { - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 0), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 1), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 2), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 3), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 4), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 5), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 6), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 7), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = { - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 0), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 1), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 2), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 3), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 4), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 5), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 6), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 7), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = { - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 0), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 1), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 2), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 3), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 4), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 5), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 6), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 7), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = { - overworld_frame(gEventObjectPic_TuberF, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = { - overworld_frame(gEventObjectPic_TuberM, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = { - overworld_frame(gEventObjectPic_Hiker, 2, 4, 0), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 1), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 2), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 3), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 4), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 5), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 6), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 7), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = { - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 0), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 1), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 2), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 3), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 4), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 5), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 6), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 7), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = { - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 0), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 1), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 2), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 3), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 4), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 5), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 6), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 7), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = { - overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { - obj_frame_tiles(gEventObjectPic_ItemBall), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = { - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 0), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 1), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 2), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 3), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 4), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 5), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 6), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 7), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { - overworld_frame(gEventObjectPic_Man4, 2, 4, 0), - overworld_frame(gEventObjectPic_Man4, 2, 4, 1), - overworld_frame(gEventObjectPic_Man4, 2, 4, 2), - overworld_frame(gEventObjectPic_Man4, 2, 4, 3), - overworld_frame(gEventObjectPic_Man4, 2, 4, 4), - overworld_frame(gEventObjectPic_Man4, 2, 4, 5), - overworld_frame(gEventObjectPic_Man4, 2, 4, 6), - overworld_frame(gEventObjectPic_Man4, 2, 4, 7), - overworld_frame(gEventObjectPic_Man4, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { - overworld_frame(gEventObjectPic_Man5, 2, 4, 0), - overworld_frame(gEventObjectPic_Man5, 2, 4, 1), - overworld_frame(gEventObjectPic_Man5, 2, 4, 2), - overworld_frame(gEventObjectPic_Man5, 2, 4, 3), - overworld_frame(gEventObjectPic_Man5, 2, 4, 4), - overworld_frame(gEventObjectPic_Man5, 2, 4, 5), - overworld_frame(gEventObjectPic_Man5, 2, 4, 6), - overworld_frame(gEventObjectPic_Man5, 2, 4, 7), - overworld_frame(gEventObjectPic_Man5, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = { - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 0), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 1), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 2), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 3), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 4), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 5), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 6), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 7), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = { - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 0), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 1), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 2), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 3), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 4), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 5), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 6), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 7), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = { - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 0), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 1), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 2), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 3), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 4), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 5), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 6), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 7), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = { - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 2), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 3), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 4), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 5), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 6), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 7), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedNatuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedMagnemiteDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedMagnemiteDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedSquirtleDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedSquirtleDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedWooperDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPikachuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPorygon2Doll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = { - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 0), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 1), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 2), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = { - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 0), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 1), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 2), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 3), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 4), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 5), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 6), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 7), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = { - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Teala[] = { - overworld_frame(gEventObjectPic_Teala, 2, 4, 0), - overworld_frame(gEventObjectPic_Teala, 2, 4, 1), - overworld_frame(gEventObjectPic_Teala, 2, 4, 2), - overworld_frame(gEventObjectPic_Teala, 2, 4, 3), - overworld_frame(gEventObjectPic_Teala, 2, 4, 4), - overworld_frame(gEventObjectPic_Teala, 2, 4, 5), - overworld_frame(gEventObjectPic_Teala, 2, 4, 6), - overworld_frame(gEventObjectPic_Teala, 2, 4, 7), - overworld_frame(gEventObjectPic_Teala, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = { - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 0), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 1), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 2), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { - obj_frame_tiles(gEventObjectPic_PushableBoulder), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = { - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { - obj_frame_tiles(gEventObjectPic_Truck), -}; - -const struct SpriteFrameImage gEventObjectPicTable_VigorothCarryingBox[] = { - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_VigorothFacingAway[] = { - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { - obj_frame_tiles(gEventObjectPic_BirchsBag), -}; - -const struct SpriteFrameImage gEventObjectPicTable_EnemyZigzagoon[] = { - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 0), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 1), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 2), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 3), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 4), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 5), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 6), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 7), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = { - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 0), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 1), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 2), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 3), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 4), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 5), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 6), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 7), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Artist[] = { - overworld_frame(gEventObjectPic_Artist, 2, 4, 0), - overworld_frame(gEventObjectPic_Artist, 2, 4, 1), - overworld_frame(gEventObjectPic_Artist, 2, 4, 2), - overworld_frame(gEventObjectPic_Artist, 2, 4, 3), - overworld_frame(gEventObjectPic_Artist, 2, 4, 4), - overworld_frame(gEventObjectPic_Artist, 2, 4, 5), - overworld_frame(gEventObjectPic_Artist, 2, 4, 6), - overworld_frame(gEventObjectPic_Artist, 2, 4, 7), - overworld_frame(gEventObjectPic_Artist, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = { - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 8), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 0), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 1), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 2), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 3), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 4), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 5), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 6), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 7), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = { - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 0), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 1), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 2), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 3), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 4), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 5), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 6), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 7), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = { - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 0), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 1), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 2), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 3), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 4), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 5), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 6), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 7), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 8), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 9), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 10), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 11), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 12), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 13), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 14), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 15), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 16), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 17), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 18), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 19), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 20), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 21), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 22), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 23), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 24), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 25), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 26), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = { - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 1), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 3), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = { - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = { - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 0), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 1), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 2), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 3), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = { - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 0), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 1), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 2), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 3), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 4), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 5), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 6), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 7), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = { - obj_frame_tiles(gEventObjectPic_MovingBox), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = { - obj_frame_tiles(gEventObjectPic_CableCar), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = { - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 0), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 1), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 2), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 3), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 4), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 5), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 6), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 7), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DevonEmployee[] = { - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 0), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 1), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 2), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 3), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 4), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 5), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 6), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 7), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = { - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 0), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 1), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 2), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 3), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 4), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 5), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 6), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 7), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = { - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 0), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 1), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 2), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 3), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 4), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 5), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 6), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 7), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = { - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 0), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 1), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 2), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 3), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 4), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 5), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 6), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 7), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = { - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 0), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 1), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 2), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 3), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 4), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 5), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 6), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 7), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = { - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = { - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = { - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Drake[] = { - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = { - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = { - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = { - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = { - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Norman[] = { - overworld_frame(gEventObjectPic_Norman, 2, 4, 0), - overworld_frame(gEventObjectPic_Norman, 2, 4, 1), - overworld_frame(gEventObjectPic_Norman, 2, 4, 2), - overworld_frame(gEventObjectPic_Norman, 2, 4, 3), - overworld_frame(gEventObjectPic_Norman, 2, 4, 4), - overworld_frame(gEventObjectPic_Norman, 2, 4, 5), - overworld_frame(gEventObjectPic_Norman, 2, 4, 6), - overworld_frame(gEventObjectPic_Norman, 2, 4, 7), - overworld_frame(gEventObjectPic_Norman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Winona[] = { - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Liza[] = { - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Tate[] = { - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = { - overworld_frame(gEventObjectPic_Wallace, 2, 4, 0), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 1), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 2), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 3), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 4), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 5), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 6), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 7), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Steven[] = { - overworld_frame(gEventObjectPic_Steven, 2, 4, 0), - overworld_frame(gEventObjectPic_Steven, 2, 4, 1), - overworld_frame(gEventObjectPic_Steven, 2, 4, 2), - overworld_frame(gEventObjectPic_Steven, 2, 4, 3), - overworld_frame(gEventObjectPic_Steven, 2, 4, 4), - overworld_frame(gEventObjectPic_Steven, 2, 4, 5), - overworld_frame(gEventObjectPic_Steven, 2, 4, 6), - overworld_frame(gEventObjectPic_Steven, 2, 4, 7), - overworld_frame(gEventObjectPic_Steven, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wally[] = { - overworld_frame(gEventObjectPic_Wally, 2, 4, 0), - overworld_frame(gEventObjectPic_Wally, 2, 4, 1), - overworld_frame(gEventObjectPic_Wally, 2, 4, 2), - overworld_frame(gEventObjectPic_Wally, 2, 4, 3), - overworld_frame(gEventObjectPic_Wally, 2, 4, 4), - overworld_frame(gEventObjectPic_Wally, 2, 4, 5), - overworld_frame(gEventObjectPic_Wally, 2, 4, 6), - overworld_frame(gEventObjectPic_Wally, 2, 4, 7), - overworld_frame(gEventObjectPic_Wally, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RubySapphireLittleBoy[] = { - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 0), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 1), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 2), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 3), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 4), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 5), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 6), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 7), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = { - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 8), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 9), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 10), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 11), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = { - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 0), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 1), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 2), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 3), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 4), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 5), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 6), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 7), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 8), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 9), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 10), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 11), -}; - -const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = { - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = { - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SubmarineShadow[] = { - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = { - obj_frame_tiles(gEventObjectPic_PichuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_PikachuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = { - obj_frame_tiles(gEventObjectPic_MarillDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = { - obj_frame_tiles(gEventObjectPic_TogepiDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = { - obj_frame_tiles(gEventObjectPic_CyndaquilDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = { - obj_frame_tiles(gEventObjectPic_ChikoritaDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = { - obj_frame_tiles(gEventObjectPic_TotodileDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = { - obj_frame_tiles(gEventObjectPic_JigglypuffDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = { - obj_frame_tiles(gEventObjectPic_MeowthDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = { - obj_frame_tiles(gEventObjectPic_ClefairyDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = { - obj_frame_tiles(gEventObjectPic_DittoDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = { - obj_frame_tiles(gEventObjectPic_SmoochumDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = { - obj_frame_tiles(gEventObjectPic_TreeckoDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = { - obj_frame_tiles(gEventObjectPic_TorchicDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = { - obj_frame_tiles(gEventObjectPic_MudkipDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = { - obj_frame_tiles(gEventObjectPic_DuskullDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = { - obj_frame_tiles(gEventObjectPic_WynautDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = { - obj_frame_tiles(gEventObjectPic_BaltoyDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = { - obj_frame_tiles(gEventObjectPic_KecleonDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = { - obj_frame_tiles(gEventObjectPic_AzurillDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = { - obj_frame_tiles(gEventObjectPic_SkittyDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = { - obj_frame_tiles(gEventObjectPic_SwabluDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = { - obj_frame_tiles(gEventObjectPic_GulpinDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = { - obj_frame_tiles(gEventObjectPic_LotadDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = { - obj_frame_tiles(gEventObjectPic_SeedotDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = { - obj_frame_tiles(gEventObjectPic_PikaCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = { - obj_frame_tiles(gEventObjectPic_RoundCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = { - obj_frame_tiles(gEventObjectPic_KissCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = { - obj_frame_tiles(gEventObjectPic_ZigzagCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = { - obj_frame_tiles(gEventObjectPic_SpinCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = { - obj_frame_tiles(gEventObjectPic_DiamondCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = { - obj_frame_tiles(gEventObjectPic_BallCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = { - obj_frame_tiles(gEventObjectPic_GrassCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = { - obj_frame_tiles(gEventObjectPic_FireCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = { - obj_frame_tiles(gEventObjectPic_WaterCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = { - obj_frame_tiles(gEventObjectPic_BigSnorlaxDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRhydonDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = { - obj_frame_tiles(gEventObjectPic_BigLaprasDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = { - obj_frame_tiles(gEventObjectPic_BigVenusaurDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = { - obj_frame_tiles(gEventObjectPic_BigCharizardDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = { - obj_frame_tiles(gEventObjectPic_BigBlastoiseDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = { - obj_frame_tiles(gEventObjectPic_BigWailmerDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegirockDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegiceDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegisteelDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = { - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GameboyKid[] = { - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ContestJudge[] = { - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 0), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 1), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 2), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 3), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 4), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 5), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 6), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 7), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = { - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = { - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 0), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 2), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 4), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = { - obj_frame_tiles(gEventObjectPic_BrendanDecorating), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = { - obj_frame_tiles(gEventObjectPic_MayDecorating), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Archie[] = { - overworld_frame(gEventObjectPic_Archie, 2, 4, 0), - overworld_frame(gEventObjectPic_Archie, 2, 4, 1), - overworld_frame(gEventObjectPic_Archie, 2, 4, 2), - overworld_frame(gEventObjectPic_Archie, 2, 4, 3), - overworld_frame(gEventObjectPic_Archie, 2, 4, 4), - overworld_frame(gEventObjectPic_Archie, 2, 4, 5), - overworld_frame(gEventObjectPic_Archie, 2, 4, 6), - overworld_frame(gEventObjectPic_Archie, 2, 4, 7), - overworld_frame(gEventObjectPic_Archie, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = { - overworld_frame(gEventObjectPic_Maxie, 2, 4, 0), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 1), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 2), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 3), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 4), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 5), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 6), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 7), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KyogreFront[] = { - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GroudonFront[] = { - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KyogreSide[] = { - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GroudonSide[] = { - overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = { - obj_frame_tiles(gEventObjectPic_Fossil), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Regi[] = { - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = { - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = { - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = { - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 0), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 1), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 2), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 3), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = { - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = { - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = { - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = { - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = { - overworld_frame(gEventObjectPic_Wingull, 2, 2, 0), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 2), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 4), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = { - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = { - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Mom[] = { - overworld_frame(gEventObjectPic_Mom, 2, 4, 0), - overworld_frame(gEventObjectPic_Mom, 2, 4, 1), - overworld_frame(gEventObjectPic_Mom, 2, 4, 2), - overworld_frame(gEventObjectPic_Mom, 2, 4, 3), - overworld_frame(gEventObjectPic_Mom, 2, 4, 4), - overworld_frame(gEventObjectPic_Mom, 2, 4, 5), - overworld_frame(gEventObjectPic_Mom, 2, 4, 6), - overworld_frame(gEventObjectPic_Mom, 2, 4, 7), - overworld_frame(gEventObjectPic_Mom, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scott[] = { - overworld_frame(gEventObjectPic_Scott, 2, 4, 0), - overworld_frame(gEventObjectPic_Scott, 2, 4, 1), - overworld_frame(gEventObjectPic_Scott, 2, 4, 2), - overworld_frame(gEventObjectPic_Scott, 2, 4, 3), - overworld_frame(gEventObjectPic_Scott, 2, 4, 4), - overworld_frame(gEventObjectPic_Scott, 2, 4, 5), - overworld_frame(gEventObjectPic_Scott, 2, 4, 6), - overworld_frame(gEventObjectPic_Scott, 2, 4, 7), - overworld_frame(gEventObjectPic_Scott, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Juan[] = { - overworld_frame(gEventObjectPic_Juan, 2, 4, 0), - overworld_frame(gEventObjectPic_Juan, 2, 4, 1), - overworld_frame(gEventObjectPic_Juan, 2, 4, 2), - overworld_frame(gEventObjectPic_Juan, 2, 4, 3), - overworld_frame(gEventObjectPic_Juan, 2, 4, 4), - overworld_frame(gEventObjectPic_Juan, 2, 4, 5), - overworld_frame(gEventObjectPic_Juan, 2, 4, 6), - overworld_frame(gEventObjectPic_Juan, 2, 4, 7), - overworld_frame(gEventObjectPic_Juan, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MysteryEventDeliveryman[] = { - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Statue[] = { - obj_frame_tiles(gEventObjectPic_Statue), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Dusclops[] = { - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 0), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 1), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 2), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 3), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 4), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 5), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 6), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 7), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Kirlia[] = { - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 0), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 1), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 2), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 3), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 4), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 5), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 6), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 7), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnionRoomAttendant[] = { - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sudowoodo[] = { - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 1), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 1), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Mew[] = { - overworld_frame(gEventObjectPic_Mew, 2, 4, 0), - overworld_frame(gEventObjectPic_Mew, 2, 4, 1), - overworld_frame(gEventObjectPic_Mew, 2, 4, 2), - overworld_frame(gEventObjectPic_Mew, 2, 4, 3), - overworld_frame(gEventObjectPic_Mew, 2, 4, 4), - overworld_frame(gEventObjectPic_Mew, 2, 4, 5), - overworld_frame(gEventObjectPic_Mew, 2, 4, 6), - overworld_frame(gEventObjectPic_Mew, 2, 4, 7), - overworld_frame(gEventObjectPic_Mew, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Red[] = { - overworld_frame(gEventObjectPic_Red, 2, 4, 0), - overworld_frame(gEventObjectPic_Red, 2, 4, 1), - overworld_frame(gEventObjectPic_Red, 2, 4, 2), - overworld_frame(gEventObjectPic_Red, 2, 4, 3), - overworld_frame(gEventObjectPic_Red, 2, 4, 4), - overworld_frame(gEventObjectPic_Red, 2, 4, 5), - overworld_frame(gEventObjectPic_Red, 2, 4, 6), - overworld_frame(gEventObjectPic_Red, 2, 4, 7), - overworld_frame(gEventObjectPic_Red, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Leaf[] = { - overworld_frame(gEventObjectPic_Leaf, 2, 4, 0), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 1), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 2), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 3), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 4), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 5), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 6), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 7), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Deoxys[] = { - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 1), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 1), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = { - obj_frame_tiles(gEventObjectPic_BirthIslandStone), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Anabel[] = { - overworld_frame(gEventObjectPic_Anabel, 2, 4, 0), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 1), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 2), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 3), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 4), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 5), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 6), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 7), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Tucker[] = { - overworld_frame(gEventObjectPic_Tucker, 2, 4, 0), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 1), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 2), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 3), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 4), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 5), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 6), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 7), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Spenser[] = { - overworld_frame(gEventObjectPic_Spenser, 2, 4, 0), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 1), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 2), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 3), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 4), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 5), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 6), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 7), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Greta[] = { - overworld_frame(gEventObjectPic_Greta, 2, 4, 0), - overworld_frame(gEventObjectPic_Greta, 2, 4, 1), - overworld_frame(gEventObjectPic_Greta, 2, 4, 2), - overworld_frame(gEventObjectPic_Greta, 2, 4, 3), - overworld_frame(gEventObjectPic_Greta, 2, 4, 4), - overworld_frame(gEventObjectPic_Greta, 2, 4, 5), - overworld_frame(gEventObjectPic_Greta, 2, 4, 6), - overworld_frame(gEventObjectPic_Greta, 2, 4, 7), - overworld_frame(gEventObjectPic_Greta, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Noland[] = { - overworld_frame(gEventObjectPic_Noland, 2, 4, 0), - overworld_frame(gEventObjectPic_Noland, 2, 4, 1), - overworld_frame(gEventObjectPic_Noland, 2, 4, 2), - overworld_frame(gEventObjectPic_Noland, 2, 4, 3), - overworld_frame(gEventObjectPic_Noland, 2, 4, 4), - overworld_frame(gEventObjectPic_Noland, 2, 4, 5), - overworld_frame(gEventObjectPic_Noland, 2, 4, 6), - overworld_frame(gEventObjectPic_Noland, 2, 4, 7), - overworld_frame(gEventObjectPic_Noland, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Lucy[] = { - overworld_frame(gEventObjectPic_Lucy, 2, 4, 0), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 1), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 2), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 3), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 4), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 5), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 6), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 7), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Brandon[] = { - overworld_frame(gEventObjectPic_Brandon, 2, 4, 0), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 1), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 2), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 3), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 4), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 5), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 6), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 7), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Lugia[] = { - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_HoOh[] = { - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RubySapphireBrendan[] = { - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = { - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 8), -}; diff --git a/src/data/trade.h b/src/data/trade.h index 9e96a54dd9..13310185ea 100644 --- a/src/data/trade.h +++ b/src/data/trade.h @@ -5,7 +5,7 @@ static const u32 sUnusedStructSizes[] = sizeof(struct SaveBlock1), sizeof(struct MapHeader), // 0x00000530, in RS - sizeof(struct MailStruct), //or EventObject / EventObjectGraphicsInfo + sizeof(struct MailStruct), //or ObjectEvent / ObjectEventGraphicsInfo sizeof(struct Pokemon), //or TrainerCard 0x00000528 // 0x000004D8, in RS }; diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 19aa40b005..b27de4513a 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -12214,4 +12214,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/decoration.c b/src/decoration.c index 2a47dd5539..731691a057 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1246,22 +1246,22 @@ void SetDecoration(void) if (FlagGet(FLAG_DECORATION_1 + i) == TRUE) { FlagClear(FLAG_DECORATION_1 + i); - for (j = 0; j < gMapHeader.events->eventObjectCount; j++) + for (j = 0; j < gMapHeader.events->objectEventCount; j++) { - if (gMapHeader.events->eventObjects[j].flagId == FLAG_DECORATION_1 + i) + if (gMapHeader.events->objectEvents[j].flagId == FLAG_DECORATION_1 + i) break; } VarSet( - VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[j].graphicsId - EVENT_OBJ_GFX_VAR_0), + VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[j].graphicsId - EVENT_OBJ_GFX_VAR_0), sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); - gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId; + gSpecialVar_0x8005 = gMapHeader.events->objectEvents[j].localId; gSpecialVar_0x8006 = sCurDecorMapX; gSpecialVar_0x8007 = sCurDecorMapY; - TrySpawnEventObject(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - TryMoveEventObjectToMapCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideEventObjectTemplateCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryMoveObjectEventToMapCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); + TryOverrideObjectEventTemplateCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); break; } } @@ -1365,9 +1365,9 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct PlaceDecorationGraphic x -= 8; if (gSaveBlock2Ptr->playerGender == MALE) - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0); else - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0); gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); @@ -1504,7 +1504,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) if (!sub_81284AC(taskId, curX, curY, behaviorBy)) return FALSE; - behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) return FALSE; } @@ -1525,7 +1525,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) if (!sub_81284AC(taskId, curX, curY, behaviorBy)) return FALSE; - if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) + if (GetObjectEventIdByXYZ(curX, curY, 0) != 16) return FALSE; } } @@ -1542,7 +1542,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) if (!sub_81284AC(taskId, curX, curY, behaviorBy)) return FALSE; - behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) return FALSE; } @@ -1579,7 +1579,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) return FALSE; } - if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) + if (GetObjectEventIdByXYZ(curX, curY, 0) != 16) return FALSE; } break; @@ -1999,7 +1999,7 @@ u8 gpu_pal_decompress_alloc_tag_and_upload(struct PlaceDecorationGraphicsDataBuf sub_8129048(data); data->decoration = &gDecorations[decor]; if (data->decoration->permission == DECORPERM_SPRITE) - return AddPseudoEventObject(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); + return AddPseudoObjectEvent(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); FreeSpritePaletteByTag(PLACE_DECORATION_SELECTOR_TAG); sub_81291E8(data); @@ -2047,7 +2047,7 @@ const u32 *GetDecorationIconPicOrPalette(u16 decor, u8 mode) return gDecorIconTable[decor][mode]; } -u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor) +u8 AddDecorationIconObjectFromObjectEvent(u16 tilesTag, u16 paletteTag, u8 decor) { u8 spriteId; struct SpriteSheet sheet; @@ -2078,7 +2078,7 @@ u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor } else { - spriteId = AddPseudoEventObject(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); + spriteId = AddPseudoObjectEvent(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); } return spriteId; } @@ -2098,7 +2098,7 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1 } else if (gDecorIconTable[decor][0] == NULL) { - spriteId = AddDecorationIconObjectFromEventObject(tilesTag, paletteTag, decor); + spriteId = AddDecorationIconObjectFromObjectEvent(tilesTag, paletteTag, decor); if (spriteId == MAX_SPRITES) return MAX_SPRITES; @@ -2142,11 +2142,11 @@ void sub_8129708(void) { gSpecialVar_0x8005 = sDecorRearrangementDataBuffer[gSpecialVar_0x8004].flagId; sub_81296EC(sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx); - for (i = 0; i < gMapHeader.events->eventObjectCount; i++) + for (i = 0; i < gMapHeader.events->objectEventCount; i++) { - if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8005) + if (gMapHeader.events->objectEvents[i].flagId == gSpecialVar_0x8005) { - gSpecialVar_0x8006 = gMapHeader.events->eventObjects[i].localId; + gSpecialVar_0x8006 = gMapHeader.events->objectEvents[i].localId; break; } } @@ -2157,11 +2157,11 @@ void sub_81297AC(void) { u8 i; - for (i = 0; i < gMapHeader.events->eventObjectCount; i++) + for (i = 0; i < gMapHeader.events->objectEventCount; i++) { - if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8004) + if (gMapHeader.events->objectEvents[i].flagId == gSpecialVar_0x8004) { - gSpecialVar_0x8005 = gMapHeader.events->eventObjects[i].localId; + gSpecialVar_0x8005 = gMapHeader.events->objectEvents[i].localId; break; } } @@ -2250,9 +2250,9 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void) sub_812A39C(); gFieldCamera.spriteId = CreateSprite(&gUnknown_085A7404, 120, 80, 0); if (gSaveBlock2Ptr->playerGender == MALE) - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0); else - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0); gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); @@ -2453,9 +2453,9 @@ void sub_8129F20(void) yOff = gDecorationContext.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] & 0x0F; for (i = 0; i < 0x40; i++) { - if (gSaveBlock1Ptr->eventObjectTemplates[i].x == xOff && gSaveBlock1Ptr->eventObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->eventObjectTemplates[i].flagId)) + if (gSaveBlock1Ptr->objectEventTemplates[i].x == xOff && gSaveBlock1Ptr->objectEventTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->objectEventTemplates[i].flagId)) { - sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->eventObjectTemplates[i].flagId; + sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->objectEventTemplates[i].flagId; break; } } diff --git a/src/easy_chat.c b/src/easy_chat.c index ce5fe3c7ad..59628ddace 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -4733,14 +4733,14 @@ static void sub_811E828(void) if (GetEasyChatScreenFrameId() != 4) return; - spriteId = AddPseudoEventObject(graphicsId, SpriteCallbackDummy, 76, 40, 0); + spriteId = AddPseudoObjectEvent(graphicsId, SpriteCallbackDummy, 76, 40, 0); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 0; StartSpriteAnim(&gSprites[spriteId], 2); } - spriteId = AddPseudoEventObject( + spriteId = AddPseudoObjectEvent( gSaveBlock2Ptr->playerGender == MALE ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, SpriteCallbackDummy, 52, diff --git a/src/event_data.c b/src/event_data.c index 50628f984d..00ae1d890f 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -187,7 +187,7 @@ bool8 VarSet(u16 id, u16 value) return TRUE; } -u8 VarGetEventObjectGraphicsId(u8 id) +u8 VarGetObjectEventGraphicsId(u8 id) { return VarGet(VAR_OBJ_GFX_ID_0 + id); } diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c index c64a2ab226..4b0ee9f701 100644 --- a/src/event_obj_lock.c +++ b/src/event_obj_lock.c @@ -39,9 +39,9 @@ bool8 sub_80983C4(void) } -void ScriptFreezeEventObjects(void) +void ScriptFreezeObjectEvents(void) { - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_80983A4, 80); } @@ -54,9 +54,9 @@ static void sub_8098400(u8 taskId) sub_808B864(); task->data[0] = 1; } - if (!task->data[1] && !gEventObjects[gSelectedEventObject].singleMovementActive) + if (!task->data[1] && !gObjectEvents[gSelectedObjectEvent].singleMovementActive) { - FreezeEventObject(&gEventObjects[gSelectedEventObject]); + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); task->data[1] = 1; } if (task->data[0] && task->data[1]) @@ -76,61 +76,61 @@ bool8 sub_809847C(void) } } -void LockSelectedEventObject(void) +void LockSelectedObjectEvent(void) { u8 taskId; - FreezeEventObjectsExceptOne(gSelectedEventObject); + FreezeObjectEventsExceptOne(gSelectedObjectEvent); taskId = CreateTask(sub_8098400, 80); - if (!gEventObjects[gSelectedEventObject].singleMovementActive) + if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive) { - FreezeEventObject(&gEventObjects[gSelectedEventObject]); + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); gTasks[taskId].data[1] = 1; } } -void ScriptUnfreezeEventObjects(void) +void ScriptUnfreezeObjectEvents(void) { - u8 playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); } void sub_8098524(void) { u8 playerObjectId; - if (gEventObjects[gSelectedEventObject].active) - EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); } void Script_FacePlayer(void) { - EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing); + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); } void Script_ClearHeldMovement(void) { - EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]); } static void sub_80985BC(u8 taskId) { struct Task *task = &gTasks[taskId]; - u8 eventObjectId = task->data[2]; + u8 objectEventId = task->data[2]; if (!task->data[0] && walkrun_is_standing_still() == TRUE) { sub_808B864(); task->data[0] = 1; } - if (!task->data[1] && !gEventObjects[eventObjectId].singleMovementActive) + if (!task->data[1] && !gObjectEvents[objectEventId].singleMovementActive) { - FreezeEventObject(&gEventObjects[eventObjectId]); + FreezeObjectEvent(&gObjectEvents[objectEventId]); task->data[1] = 1; } if (task->data[0] && task->data[1]) @@ -140,34 +140,34 @@ static void sub_80985BC(u8 taskId) void sub_8098630(void) { u8 trainerObjectId1, trainerObjectId2, taskId; - trainerObjectId1 = GetChosenApproachingTrainerEventObjectId(0); + trainerObjectId1 = GetChosenApproachingTrainerObjectEventId(0); if(gNoOfApproachingTrainers == 2) { - trainerObjectId2 = GetChosenApproachingTrainerEventObjectId(1); + trainerObjectId2 = GetChosenApproachingTrainerObjectEventId(1); sub_8098074(trainerObjectId1, trainerObjectId2); taskId = CreateTask(sub_80985BC, 80); gTasks[taskId].data[2] = trainerObjectId1; - if(!gEventObjects[trainerObjectId1].singleMovementActive) + if(!gObjectEvents[trainerObjectId1].singleMovementActive) { - FreezeEventObject(&gEventObjects[trainerObjectId1]); + FreezeObjectEvent(&gObjectEvents[trainerObjectId1]); gTasks[taskId].data[1] = 1; } taskId = CreateTask(sub_80985BC, 81); gTasks[taskId].data[2] = trainerObjectId2; - if(!gEventObjects[trainerObjectId2].singleMovementActive) + if(!gObjectEvents[trainerObjectId2].singleMovementActive) { - FreezeEventObject(&gEventObjects[trainerObjectId2]); + FreezeObjectEvent(&gObjectEvents[trainerObjectId2]); gTasks[taskId].data[1] = 1; } } else { - FreezeEventObjectsExceptOne(trainerObjectId1); + FreezeObjectEventsExceptOne(trainerObjectId1); taskId = CreateTask(sub_80985BC, 80); gTasks[taskId].data[2] = trainerObjectId1; - if(!gEventObjects[trainerObjectId1].singleMovementActive) + if(!gObjectEvents[trainerObjectId1].singleMovementActive) { - FreezeEventObject(&gEventObjects[trainerObjectId1]); + FreezeObjectEvent(&gObjectEvents[trainerObjectId1]); gTasks[taskId].data[1] = 1; } } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index c746f08b1c..1a6cc6c0d9 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -31,104 +31,104 @@ // this file was known as evobjmv.c in Game Freak's original source #define movement_type_def(setup, table) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +static u8 setup##_callback(struct ObjectEvent *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, setup##_callback);\ }\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ +static u8 setup##_callback(struct ObjectEvent *objectEvent, struct Sprite *sprite)\ {\ - return table[sprite->data[1]](eventObject, sprite);\ + return table[sprite->data[1]](objectEvent, sprite);\ } #define movement_type_empty_callback(setup) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +static u8 setup##_callback(struct ObjectEvent *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, setup##_callback);\ }\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ +static u8 setup##_callback(struct ObjectEvent *objectEvent, struct Sprite *sprite)\ {\ return 0;\ } EWRAM_DATA u8 sCurrentReflectionType = 0; EWRAM_DATA u16 sCurrentSpecialObjectPaletteTag = 0; -EWRAM_DATA struct LockedAnimEventObjects *gLockedAnimEventObjects = {0}; +EWRAM_DATA struct LockedAnimObjectEvents *gLockedAnimObjectEvents = {0}; static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16); -static bool8 EventObjectExecSingleMovementAction(struct EventObject *, struct Sprite *); +static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *, struct Sprite *); static void SetMovementDelay(struct Sprite *, s16); static bool8 WaitForMovementDelay(struct Sprite *); -static u8 GetCollisionInDirection(struct EventObject *, u8); +static u8 GetCollisionInDirection(struct ObjectEvent *, u8); static u32 state_to_direction(u8, u32, u32); -static void TryEnableEventObjectAnim(struct EventObject *, struct Sprite *); -static void EventObjectExecHeldMovementAction(struct EventObject *, struct Sprite *); -static void UpdateEventObjectSpriteAnimPause(struct EventObject *, struct Sprite *); -static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *, s16, s16); -static bool8 IsMetatileDirectionallyImpassable(struct EventObject *, s16, s16, u8); -static bool8 DoesObjectCollideWithObjectAt(struct EventObject *, s16, s16); -static void sub_8096530(struct EventObject *, struct Sprite *); -static void UpdateEventObjSpriteVisibility(struct EventObject *, struct Sprite *); -static void EventObjectUpdateMetatileBehaviors(struct EventObject*); -static void GetGroundEffectFlags_Reflection(struct EventObject*, u32*); -static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject*, u32*); -static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject*, u32*); -static void GetGroundEffectFlags_SandHeap(struct EventObject*, u32*); -static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject*, u32*); -static void GetGroundEffectFlags_ShortGrass(struct EventObject*, u32*); -static void GetGroundEffectFlags_HotSprings(struct EventObject*, u32*); -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject*, u32*); -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject*, u32*); -static void GetGroundEffectFlags_Tracks(struct EventObject*, u32*); -static void GetGroundEffectFlags_Puddle(struct EventObject*, u32*); -static void GetGroundEffectFlags_Ripple(struct EventObject*, u32*); -static void GetGroundEffectFlags_Seaweed(struct EventObject*, u32*); -static void GetGroundEffectFlags_JumpLanding(struct EventObject*, u32*); -static u8 EventObjectCheckForReflectiveSurface(struct EventObject*); +static void TryEnableObjectEventAnim(struct ObjectEvent *, struct Sprite *); +static void ObjectEventExecHeldMovementAction(struct ObjectEvent *, struct Sprite *); +static void UpdateObjectEventSpriteAnimPause(struct ObjectEvent *, struct Sprite *); +static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent *, s16, s16); +static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *, s16, s16, u8); +static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *, s16, s16); +static void sub_8096530(struct ObjectEvent *, struct Sprite *); +static void UpdateEventObjSpriteVisibility(struct ObjectEvent *, struct Sprite *); +static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent*); +static void GetGroundEffectFlags_Reflection(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_SandHeap(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Tracks(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Puddle(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Ripple(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent*, u32*); +static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent*); static u8 GetReflectionTypeByMetatileBehavior(u32); static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); -static void EventObjectUpdateSubpriority(struct EventObject*, struct Sprite*); -static void DoTracksGroundEffect_None(struct EventObject*, struct Sprite*, u8); -static void DoTracksGroundEffect_Footprints(struct EventObject*, struct Sprite*, u8); -static void DoTracksGroundEffect_BikeTireTracks(struct EventObject*, struct Sprite*, u8); -static void DoRippleFieldEffect(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnSpawn(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnBeginStep(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnFinishStep(struct EventObject*, struct Sprite*); +static void ObjectEventUpdateSubpriority(struct ObjectEvent*, struct Sprite*); +static void DoTracksGroundEffect_None(struct ObjectEvent*, struct Sprite*, u8); +static void DoTracksGroundEffect_Footprints(struct ObjectEvent*, struct Sprite*, u8); +static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent*, struct Sprite*, u8); +static void DoRippleFieldEffect(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnSpawn(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnBeginStep(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnFinishStep(struct ObjectEvent*, struct Sprite*); static void sub_8097D68(struct Sprite*); static void ApplyLevitateMovement(u8); -static bool8 MovementType_Disguise_Callback(struct EventObject *, struct Sprite *); -static bool8 MovementType_Hidden_Callback(struct EventObject *, struct Sprite *); +static bool8 MovementType_Disguise_Callback(struct ObjectEvent *, struct Sprite *); +static bool8 MovementType_Hidden_Callback(struct ObjectEvent *, struct Sprite *); static void CreateReflectionEffectSprites(void); -static u8 GetEventObjectIdByLocalId(u8); -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8); -static bool8 GetAvailableEventObjectId(u16, u8, u8, u8 *); -static void SetEventObjectDynamicGraphicsId(struct EventObject *); -static void RemoveEventObjectInternal(struct EventObject *); -static u16 GetEventObjectFlagIdByEventObjectId(u8); -static void UpdateEventObjectVisibility(struct EventObject *, struct Sprite *); -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); -static void GetEventObjectMovingCameraOffset(s16 *, s16 *); -static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8); -static void LoadEventObjectPalette(u16); -static void RemoveEventObjectIfOutsideView(struct EventObject *); +static u8 GetObjectEventIdByLocalId(u8); +static u8 GetObjectEventIdByLocalIdAndMapInternal(u8, u8, u8); +static bool8 GetAvailableObjectEventId(u16, u8, u8, u8 *); +static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *); +static void RemoveObjectEventInternal(struct ObjectEvent *); +static u16 GetObjectEventFlagIdByObjectEventId(u8); +static void UpdateObjectEventVisibility(struct ObjectEvent *, struct Sprite *); +static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); +static void GetObjectEventMovingCameraOffset(s16 *, s16 *); +static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8); +static void LoadObjectEventPalette(u16); +static void RemoveObjectEventIfOutsideView(struct ObjectEvent *); static void sub_808E1B8(u8, s16, s16); -static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8); -static void sub_808E38C(struct EventObject *); +static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8); +static void sub_808E38C(struct ObjectEvent *); static u8 sub_808E8F4(const struct SpritePalette *); -static u8 FindEventObjectPaletteIndexByTag(u16); +static u8 FindObjectEventPaletteIndexByTag(u16); static void sub_808EAB0(u16, u8); -static bool8 EventObjectDoesZCoordMatch(struct EventObject *, u8); +static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *, u8); static void ObjectCB_CameraObject(struct Sprite *); static void CameraObject_0(struct Sprite *); static void CameraObject_1(struct Sprite *); static void CameraObject_2(struct Sprite *); -static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count); -static void ClearEventObjectMovement(struct EventObject *, struct Sprite *); -static void EventObjectSetSingleMovement(struct EventObject *, struct Sprite *, u8); +static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId, struct ObjectEventTemplate *templates, u8 count); +static void ClearObjectEventMovement(struct ObjectEvent *, struct Sprite *); +static void ObjectEventSetSingleMovement(struct ObjectEvent *, struct Sprite *, u8); static void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); +static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *); const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; @@ -140,7 +140,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_2, }; -#include "data/field_event_obj/event_object_graphics.h" +#include "data/event_object/event_object_graphics.h" // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = @@ -433,50 +433,50 @@ const u8 gInitialMovementTypeFacingDirections[] = { #define EVENT_OBJ_PAL_TAG_34 0x1123 #define EVENT_OBJ_PAL_TAG_NONE 0x11FF -#include "data/field_event_obj/event_object_graphics_info_pointers.h" -#include "data/field_event_obj/field_effect_object_template_pointers.h" -#include "data/field_event_obj/event_object_pic_tables.h" -#include "data/field_event_obj/event_object_anims.h" -#include "data/field_event_obj/base_oam.h" -#include "data/field_event_obj/event_object_subsprites.h" -#include "data/field_event_obj/event_object_graphics_info.h" +#include "data/event_object/event_object_graphics_info_pointers.h" +#include "data/event_object/field_effect_object_template_pointers.h" +#include "data/event_object/event_object_pic_tables.h" +#include "data/event_object/event_object_anims.h" +#include "data/event_object/base_oam.h" +#include "data/event_object/event_object_subsprites.h" +#include "data/event_object/event_object_graphics_info.h" -const struct SpritePalette sEventObjectSpritePalettes[] = { - {gEventObjectPalette0, EVENT_OBJ_PAL_TAG_0}, - {gEventObjectPalette1, EVENT_OBJ_PAL_TAG_1}, - {gEventObjectPalette2, EVENT_OBJ_PAL_TAG_2}, - {gEventObjectPalette3, EVENT_OBJ_PAL_TAG_3}, - {gEventObjectPalette4, EVENT_OBJ_PAL_TAG_4}, - {gEventObjectPalette5, EVENT_OBJ_PAL_TAG_5}, - {gEventObjectPalette6, EVENT_OBJ_PAL_TAG_6}, - {gEventObjectPalette7, EVENT_OBJ_PAL_TAG_7}, - {gEventObjectPalette8, EVENT_OBJ_PAL_TAG_8}, - {gEventObjectPalette9, EVENT_OBJ_PAL_TAG_9}, - {gEventObjectPalette10, EVENT_OBJ_PAL_TAG_10}, - {gEventObjectPalette11, EVENT_OBJ_PAL_TAG_11}, - {gEventObjectPalette12, EVENT_OBJ_PAL_TAG_12}, - {gEventObjectPalette13, EVENT_OBJ_PAL_TAG_13}, - {gEventObjectPalette14, EVENT_OBJ_PAL_TAG_14}, - {gEventObjectPalette15, EVENT_OBJ_PAL_TAG_15}, - {gEventObjectPalette16, EVENT_OBJ_PAL_TAG_16}, - {gEventObjectPalette17, EVENT_OBJ_PAL_TAG_17}, - {gEventObjectPalette18, EVENT_OBJ_PAL_TAG_18}, - {gEventObjectPalette19, EVENT_OBJ_PAL_TAG_19}, - {gEventObjectPalette20, EVENT_OBJ_PAL_TAG_20}, - {gEventObjectPalette21, EVENT_OBJ_PAL_TAG_21}, - {gEventObjectPalette22, EVENT_OBJ_PAL_TAG_22}, - {gEventObjectPalette23, EVENT_OBJ_PAL_TAG_23}, - {gEventObjectPalette24, EVENT_OBJ_PAL_TAG_24}, - {gEventObjectPalette25, EVENT_OBJ_PAL_TAG_25}, - {gEventObjectPalette26, EVENT_OBJ_PAL_TAG_26}, - {gEventObjectPalette27, EVENT_OBJ_PAL_TAG_27}, - {gEventObjectPalette28, EVENT_OBJ_PAL_TAG_28}, - {gEventObjectPalette29, EVENT_OBJ_PAL_TAG_29}, - {gEventObjectPalette30, EVENT_OBJ_PAL_TAG_30}, - {gEventObjectPalette31, EVENT_OBJ_PAL_TAG_31}, - {gEventObjectPalette32, EVENT_OBJ_PAL_TAG_32}, - {gEventObjectPalette33, EVENT_OBJ_PAL_TAG_33}, - {gEventObjectPalette34, EVENT_OBJ_PAL_TAG_34}, +const struct SpritePalette sObjectEventSpritePalettes[] = { + {gObjectEventPalette0, EVENT_OBJ_PAL_TAG_0}, + {gObjectEventPalette1, EVENT_OBJ_PAL_TAG_1}, + {gObjectEventPalette2, EVENT_OBJ_PAL_TAG_2}, + {gObjectEventPalette3, EVENT_OBJ_PAL_TAG_3}, + {gObjectEventPalette4, EVENT_OBJ_PAL_TAG_4}, + {gObjectEventPalette5, EVENT_OBJ_PAL_TAG_5}, + {gObjectEventPalette6, EVENT_OBJ_PAL_TAG_6}, + {gObjectEventPalette7, EVENT_OBJ_PAL_TAG_7}, + {gObjectEventPalette8, EVENT_OBJ_PAL_TAG_8}, + {gObjectEventPalette9, EVENT_OBJ_PAL_TAG_9}, + {gObjectEventPalette10, EVENT_OBJ_PAL_TAG_10}, + {gObjectEventPalette11, EVENT_OBJ_PAL_TAG_11}, + {gObjectEventPalette12, EVENT_OBJ_PAL_TAG_12}, + {gObjectEventPalette13, EVENT_OBJ_PAL_TAG_13}, + {gObjectEventPalette14, EVENT_OBJ_PAL_TAG_14}, + {gObjectEventPalette15, EVENT_OBJ_PAL_TAG_15}, + {gObjectEventPalette16, EVENT_OBJ_PAL_TAG_16}, + {gObjectEventPalette17, EVENT_OBJ_PAL_TAG_17}, + {gObjectEventPalette18, EVENT_OBJ_PAL_TAG_18}, + {gObjectEventPalette19, EVENT_OBJ_PAL_TAG_19}, + {gObjectEventPalette20, EVENT_OBJ_PAL_TAG_20}, + {gObjectEventPalette21, EVENT_OBJ_PAL_TAG_21}, + {gObjectEventPalette22, EVENT_OBJ_PAL_TAG_22}, + {gObjectEventPalette23, EVENT_OBJ_PAL_TAG_23}, + {gObjectEventPalette24, EVENT_OBJ_PAL_TAG_24}, + {gObjectEventPalette25, EVENT_OBJ_PAL_TAG_25}, + {gObjectEventPalette26, EVENT_OBJ_PAL_TAG_26}, + {gObjectEventPalette27, EVENT_OBJ_PAL_TAG_27}, + {gObjectEventPalette28, EVENT_OBJ_PAL_TAG_28}, + {gObjectEventPalette29, EVENT_OBJ_PAL_TAG_29}, + {gObjectEventPalette30, EVENT_OBJ_PAL_TAG_30}, + {gObjectEventPalette31, EVENT_OBJ_PAL_TAG_31}, + {gObjectEventPalette32, EVENT_OBJ_PAL_TAG_32}, + {gObjectEventPalette33, EVENT_OBJ_PAL_TAG_33}, + {gObjectEventPalette34, EVENT_OBJ_PAL_TAG_34}, {NULL, 0x0000}, }; @@ -661,14 +661,14 @@ const u16 *const gObjectPaletteTagSets[] = { gObjectPaletteTags3, }; -#include "data/field_event_obj/berry_tree_graphics_tables.h" -#include "data/field_event_obj/field_effect_objects.h" +#include "data/event_object/berry_tree_graphics_tables.h" +#include "data/event_object/field_effect_objects.h" const s16 gMovementDelaysMedium[] = {32, 64, 96, 128}; const s16 gMovementDelaysLong[] = {32, 64, 128, 192}; const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; -#include "data/field_event_obj/movement_type_func_tables.h" +#include "data/event_object/movement_type_func_tables.h" const u8 gFaceDirectionAnimNums[] = { [DIR_NONE] = 0, @@ -1089,31 +1089,31 @@ const u8 gUnknown_0850DC3F[][4] = { {3, 4, 2, 1} }; -#include "data/field_event_obj/movement_action_func_tables.h" +#include "data/event_object/movement_action_func_tables.h" // Code -static void ClearEventObject(struct EventObject *eventObject) +static void ClearObjectEvent(struct ObjectEvent *objectEvent) { - *eventObject = (struct EventObject){}; - eventObject->localId = 0xFF; - eventObject->mapNum = 0xFF; - eventObject->mapGroup = 0xFF; - eventObject->movementActionId = 0xFF; + *objectEvent = (struct ObjectEvent){}; + objectEvent->localId = 0xFF; + objectEvent->mapNum = 0xFF; + objectEvent->mapGroup = 0xFF; + objectEvent->movementActionId = 0xFF; } -static void ClearAllEventObjects(void) +static void ClearAllObjectEvents(void) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - ClearEventObject(&gEventObjects[i]); + ClearObjectEvent(&gObjectEvents[i]); } -void ResetEventObjects(void) +void ResetObjectEvents(void) { - ClearLinkPlayerEventObjects(); - ClearAllEventObjects(); + ClearLinkPlayerObjectEvents(); + ClearAllObjectEvents(); ClearPlayerAvatarInfo(); CreateReflectionEffectSprites(); } @@ -1133,66 +1133,66 @@ static void CreateReflectionEffectSprites(void) gSprites[spriteId].invisible = TRUE; } -u8 GetFirstInactiveEventObjectId(void) +u8 GetFirstInactiveObjectEventId(void) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (!gEventObjects[i].active) + if (!gObjectEvents[i].active) break; } return i; } -u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) +u8 GetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) { if (localId < EVENT_OBJ_ID_PLAYER) { - return GetEventObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); + return GetObjectEventIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); } - return GetEventObjectIdByLocalId(localId); + return GetObjectEventIdByLocalId(localId); } -bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId, u8 *eventObjectId) +bool8 TryGetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId, u8 *objectEventId) { - *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroupId); - if (*eventObjectId == EVENT_OBJECTS_COUNT) + *objectEventId = GetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroupId); + if (*objectEventId == EVENT_OBJECTS_COUNT) return TRUE; else return FALSE; } -u8 GetEventObjectIdByXY(s16 x, s16 y) +u8 GetObjectEventIdByXY(s16 x, s16 y) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) + if (gObjectEvents[i].active && gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y) break; } return i; } -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroupId) +static u8 GetObjectEventIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroupId) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroupId) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroupId) return i; } return EVENT_OBJECTS_COUNT; } -static u8 GetEventObjectIdByLocalId(u8 localId) +static u8 GetObjectEventIdByLocalId(u8 localId) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].localId == localId) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId) return i; } @@ -1201,62 +1201,62 @@ static u8 GetEventObjectIdByLocalId(u8 localId) // This function has the same nonmatching quirk as in Ruby/Sapphire. #ifdef NONMATCHING -static u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup) +static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, u8 mapNum, u8 mapGroup) { - struct EventObject *eventObject; - u8 eventObjectId; + struct ObjectEvent *objectEvent; + u8 objectEventId; s16 x; s16 y; // mapNum and mapGroup are in the wrong registers (r7/r6 instead of r6/r7) - if (GetAvailableEventObjectId(template->localId, mapNum, mapGroup, &eventObjectId)) + if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId)) { return EVENT_OBJECTS_COUNT; } - eventObject = &gEventObjects[eventObjectId]; - ClearEventObject(eventObject); + objectEvent = &gObjectEvents[objectEventId]; + ClearObjectEvent(objectEvent); x = template->x + 7; y = template->y + 7; - eventObject->active = TRUE; - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->graphicsId = template->graphicsId; - eventObject->movementType = template->movementType; - eventObject->localId = template->localId; - eventObject->mapNum = mapNum; - eventObject->mapGroup = mapGroup; - eventObject->initialCoords.x = x; - eventObject->initialCoords.y = y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; - eventObject->previousCoords.x = x; - eventObject->previousCoords.y = y; - eventObject->currentElevation = template->elevation; - eventObject->previousElevation = template->elevation; + objectEvent->active = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->graphicsId = template->graphicsId; + objectEvent->movementType = template->movementType; + objectEvent->localId = template->localId; + objectEvent->mapNum = mapNum; + objectEvent->mapGroup = mapGroup; + objectEvent->initialCoords.x = x; + objectEvent->initialCoords.y = y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; + objectEvent->previousCoords.x = x; + objectEvent->previousCoords.y = y; + objectEvent->currentElevation = template->elevation; + objectEvent->previousElevation = template->elevation; // For some reason, 0x0F is placed in r9, to be used later - eventObject->range.as_nybbles.x = template->movementRangeX; - eventObject->range.as_nybbles.y = template->movementRangeY; - eventObject->trainerType = template->trainerType; - eventObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId; - eventObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; - SetEventObjectDirection(eventObject, eventObject->previousMovementDirection); - SetEventObjectDynamicGraphicsId(eventObject); + objectEvent->range.as_nybbles.x = template->movementRangeX; + objectEvent->range.as_nybbles.y = template->movementRangeY; + objectEvent->trainerType = template->trainerType; + objectEvent->trainerRange_berryTreeId = template->trainerRange_berryTreeId; + objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; + SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection); + SetObjectEventDynamicGraphicsId(objectEvent); - if (gRangedMovementTypes[eventObject->movementType]) + if (gRangedMovementTypes[objectEvent->movementType]) { - if ((eventObject->range.as_nybbles.x) == 0) + if ((objectEvent->range.as_nybbles.x) == 0) { // r9 is invoked here - eventObject->range.as_nybbles.x++; + objectEvent->range.as_nybbles.x++; } - if ((eventObject->range.as_nybbles.y) == 0) + if ((objectEvent->range.as_nybbles.y) == 0) { - eventObject->range.as_nybbles.y++; + objectEvent->range.as_nybbles.y++; } } - return eventObjectId; + return objectEventId; } #else -static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapId, u8 mapGroupId) +static NAKED u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, u8 mapId, u8 mapGroupId) { asm_unified("\tpush {r4-r7,lr}\n" "\tmov r7, r9\n" @@ -1272,7 +1272,7 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem "\tadds r1, r6, 0\n" "\tadds r2, r7, 0\n" "\tmov r3, sp\n" - "\tbl GetAvailableEventObjectId\n" + "\tbl GetAvailableObjectEventId\n" "\tlsls r0, 24\n" "\tcmp r0, 0\n" "\tbeq _0808D66E\n" @@ -1284,10 +1284,10 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem "\tlsls r0, r1, 3\n" "\tadds r0, r1\n" "\tlsls r0, 2\n" - "\tldr r1, =gEventObjects\n" + "\tldr r1, =gObjectEvents\n" "\tadds r4, r0, r1\n" "\tadds r0, r4, 0\n" - "\tbl ClearEventObject\n" + "\tbl ClearObjectEvent\n" "\tldrh r3, [r5, 0x4]\n" "\tadds r3, 0x7\n" "\tlsls r3, 16\n" @@ -1361,9 +1361,9 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem "\tstrb r1, [r0]\n" "\tldrb r1, [r0]\n" "\tadds r0, r4, 0\n" - "\tbl SetEventObjectDirection\n" + "\tbl SetObjectEventDirection\n" "\tadds r0, r4, 0\n" - "\tbl SetEventObjectDynamicGraphicsId\n" + "\tbl SetObjectEventDynamicGraphicsId\n" "\tldr r1, =gRangedMovementTypes\n" "\tldrb r0, [r4, 0x6]\n" "\tadds r0, r1\n" @@ -1412,42 +1412,42 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem } #endif -u8 Unref_TryInitLocalEventObject(u8 localId) +u8 Unref_TryInitLocalObjectEvent(u8 localId) { u8 i; - u8 eventObjectCount; - struct EventObjectTemplate *template; + u8 objectEventCount; + struct ObjectEventTemplate *template; if (gMapHeader.events != NULL) { if (InBattlePyramid()) { - eventObjectCount = GetNumBattlePyramidEventObjects(); + objectEventCount = GetNumBattlePyramidObjectEvents(); } else if (InTrainerHill()) { - eventObjectCount = 2; + objectEventCount = 2; } else { - eventObjectCount = gMapHeader.events->eventObjectCount; + objectEventCount = gMapHeader.events->objectEventCount; } - for (i = 0; i < eventObjectCount; i++) + for (i = 0; i < objectEventCount; i++) { - template = &gSaveBlock1Ptr->eventObjectTemplates[i]; + template = &gSaveBlock1Ptr->objectEventTemplates[i]; if (template->localId == localId && !FlagGet(template->flagId)) { - return InitEventObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + return InitObjectEventStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } } } return EVENT_OBJECTS_COUNT; } -static bool8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId) +static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 *objectEventId) // Looks for an empty slot. // Returns FALSE and the location of the available slot -// in *eventObjectId. +// in *objectEventId. // If no slots are available, or if the object is already // loaded, returns TRUE. { @@ -1455,73 +1455,73 @@ static bool8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 * for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (!gEventObjects[i].active) + if (!gObjectEvents[i].active) break; - if (gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) + if (gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; } if (i >= EVENT_OBJECTS_COUNT) return TRUE; - *eventObjectId = i; + *objectEventId = i; do { - if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; i++; } while (i < EVENT_OBJECTS_COUNT); return FALSE; } -static void RemoveEventObject(struct EventObject *eventObject) +static void RemoveObjectEvent(struct ObjectEvent *objectEvent) { - eventObject->active = FALSE; - RemoveEventObjectInternal(eventObject); + objectEvent->active = FALSE; + RemoveObjectEventInternal(objectEvent); } -void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +void RemoveObjectEventByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId)); - RemoveEventObject(&gEventObjects[eventObjectId]); + FlagSet(GetObjectEventFlagIdByObjectEventId(objectEventId)); + RemoveObjectEvent(&gObjectEvents[objectEventId]); } } -static void RemoveEventObjectInternal(struct EventObject *eventObject) +static void RemoveObjectEventInternal(struct ObjectEvent *objectEvent) { struct SpriteFrameImage image; - image.size = GetEventObjectGraphicsInfo(eventObject->graphicsId)->size; - gSprites[eventObject->spriteId].images = ℑ - DestroySprite(&gSprites[eventObject->spriteId]); + image.size = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->size; + gSprites[objectEvent->spriteId].images = ℑ + DestroySprite(&gSprites[objectEvent->spriteId]); } -void RemoveAllEventObjectsExceptPlayer(void) +void RemoveAllObjectEventsExceptPlayer(void) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (i != gPlayerAvatar.eventObjectId) - RemoveEventObject(&gEventObjects[i]); + if (i != gPlayerAvatar.objectEventId) + RemoveObjectEvent(&gObjectEvents[i]); } } -static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { u8 spriteId; u8 paletteSlot; - u8 eventObjectId; + u8 objectEventId; struct Sprite *sprite; - struct EventObject *eventObject; - const struct EventObjectGraphicsInfo *graphicsInfo; + struct ObjectEvent *objectEvent; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = InitEventObjectStateFromTemplate(eventObjectTemplate, mapNum, mapGroup); - if (eventObjectId == EVENT_OBJECTS_COUNT) + objectEventId = InitObjectEventStateFromTemplate(objectEventTemplate, mapNum, mapGroup); + if (objectEventId == EVENT_OBJECTS_COUNT) return EVENT_OBJECTS_COUNT; - eventObject = &gEventObjects[eventObjectId]; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + objectEvent = &gObjectEvents[objectEventId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1537,104 +1537,104 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); } - if (eventObject->movementType == MOVEMENT_TYPE_INVISIBLE) - eventObject->invisible = TRUE; + if (objectEvent->movementType == MOVEMENT_TYPE_INVISIBLE) + objectEvent->invisible = TRUE; *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { - gEventObjects[eventObjectId].active = FALSE; + gObjectEvents[objectEventId].active = FALSE; return EVENT_OBJECTS_COUNT; } sprite = &gSprites[spriteId]; - sub_8092FF0(eventObject->currentCoords.x + cameraX, eventObject->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y); + sub_8092FF0(objectEvent->currentCoords.x + cameraX, objectEvent->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->oam.paletteNum = paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = eventObjectId; - eventObject->spriteId = spriteId; - eventObject->inanimate = graphicsInfo->inanimate; - if (!eventObject->inanimate) - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); + sprite->data[0] = objectEventId; + objectEvent->spriteId = spriteId; + objectEvent->inanimate = graphicsInfo->inanimate; + if (!objectEvent->inanimate) + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objectEvent->facingDirection)); - SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); - UpdateEventObjectVisibility(eventObject, sprite); - return eventObjectId; + SetObjectSubpriorityByZCoord(objectEvent->previousElevation, sprite, 1); + UpdateObjectEventVisibility(objectEvent, sprite); + return objectEventId; } -static u8 TrySpawnEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 TrySpawnObjectEventTemplate(struct ObjectEventTemplate *objectEventTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { - u8 eventObjectId; + u8 objectEventId; struct SpriteTemplate spriteTemplate; struct SpriteFrameImage spriteFrameImage; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; const struct SubspriteTable *subspriteTables = NULL; - graphicsInfo = GetEventObjectGraphicsInfo(eventObjectTemplate->graphicsId); - MakeObjectTemplateFromEventObjectTemplate(eventObjectTemplate, &spriteTemplate, &subspriteTables); + graphicsInfo = GetObjectEventGraphicsInfo(objectEventTemplate->graphicsId); + MakeObjectTemplateFromObjectEventTemplate(objectEventTemplate, &spriteTemplate, &subspriteTables); spriteFrameImage.size = graphicsInfo->size; spriteTemplate.images = &spriteFrameImage; - eventObjectId = TrySetupEventObjectSprite(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); - if (eventObjectId == EVENT_OBJECTS_COUNT) + objectEventId = TrySetupObjectEventSprite(objectEventTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); + if (objectEventId == EVENT_OBJECTS_COUNT) return EVENT_OBJECTS_COUNT; - gSprites[gEventObjects[eventObjectId].spriteId].images = graphicsInfo->images; + gSprites[gObjectEvents[objectEventId].spriteId].images = graphicsInfo->images; if (subspriteTables) - SetSubspriteTables(&gSprites[gEventObjects[eventObjectId].spriteId], subspriteTables); + SetSubspriteTables(&gSprites[gObjectEvents[objectEventId].spriteId], subspriteTables); - return eventObjectId; + return objectEventId; } -u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate) +u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *objectEventTemplate) { s16 cameraX; s16 cameraY; - GetEventObjectMovingCameraOffset(&cameraX, &cameraY); - return TrySpawnEventObjectTemplate(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); + GetObjectEventMovingCameraOffset(&cameraX, &cameraY); + return TrySpawnObjectEventTemplate(objectEventTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } -u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) +u8 SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) { - struct EventObjectTemplate eventObjectTemplate; + struct ObjectEventTemplate objectEventTemplate; x -= 7; y -= 7; - eventObjectTemplate.localId = localId; - eventObjectTemplate.graphicsId = graphicsId; - eventObjectTemplate.unk2 = 0; - eventObjectTemplate.x = x; - eventObjectTemplate.y = y; - eventObjectTemplate.elevation = z; - eventObjectTemplate.movementType = movementBehavior; - eventObjectTemplate.movementRangeX = 0; - eventObjectTemplate.movementRangeY = 0; - eventObjectTemplate.trainerType = 0; - eventObjectTemplate.trainerRange_berryTreeId = 0; - return SpawnSpecialEventObject(&eventObjectTemplate); + objectEventTemplate.localId = localId; + objectEventTemplate.graphicsId = graphicsId; + objectEventTemplate.unk2 = 0; + objectEventTemplate.x = x; + objectEventTemplate.y = y; + objectEventTemplate.elevation = z; + objectEventTemplate.movementType = movementBehavior; + objectEventTemplate.movementRangeX = 0; + objectEventTemplate.movementRangeY = 0; + objectEventTemplate.trainerType = 0; + objectEventTemplate.trainerRange_berryTreeId = 0; + return SpawnSpecialObjectEvent(&objectEventTemplate); } -u8 TrySpawnEventObject(u8 localId, u8 mapNum, u8 mapGroup) +u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; s16 cameraX, cameraY; - eventObjectTemplate = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - if (!eventObjectTemplate) + objectEventTemplate = GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup); + if (!objectEventTemplate) return EVENT_OBJECTS_COUNT; - GetEventObjectMovingCameraOffset(&cameraX, &cameraY); - return TrySpawnEventObjectTemplate(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY); + GetObjectEventMovingCameraOffset(&cameraX, &cameraY); + return TrySpawnObjectEventTemplate(objectEventTemplate, mapNum, mapGroup, cameraX, cameraY); } -static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); spriteTemplate->tileTag = graphicsInfo->tileTag; spriteTemplate->paletteTag = graphicsInfo->paletteTag1; @@ -1646,17 +1646,17 @@ static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void ( *subspriteTables = graphicsInfo->subspriteTables; } -static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[callbackIndex], spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, sMovementTypeCallbacks[callbackIndex], spriteTemplate, subspriteTables); } -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *objectEventTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjectTemplate->graphicsId, eventObjectTemplate->movementType, spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEventTemplate->graphicsId, objectEventTemplate->movementType, spriteTemplate, subspriteTables); } -u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) +u8 AddPseudoObjectEvent(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) { struct SpriteTemplate *spriteTemplate; const struct SubspriteTable *subspriteTables; @@ -1664,10 +1664,10 @@ u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x u8 spriteId; spriteTemplate = malloc(sizeof(struct SpriteTemplate)); - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); if (spriteTemplate->paletteTag != 0xFFFF) { - LoadEventObjectPalette(spriteTemplate->paletteTag); + LoadObjectEventPalette(spriteTemplate->paletteTag); } spriteId = CreateSprite(spriteTemplate, x, y, subpriority); free(spriteTemplate); @@ -1687,10 +1687,10 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) struct Sprite *sprite; struct SpriteTemplate spriteTemplate; const struct SubspriteTable *subspriteTables; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); + graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, UpdateObjectEventSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; x += 7; y += 7; @@ -1730,7 +1730,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) return spriteId; } -void TrySpawnEventObjects(s16 cameraX, s16 cameraY) +void TrySpawnObjectEvents(s16 cameraX, s16 cameraY) { u8 i; u8 objectCount; @@ -1744,7 +1744,7 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY) if (InBattlePyramid()) { - objectCount = GetNumBattlePyramidEventObjects(); + objectCount = GetNumBattlePyramidObjectEvents(); } else if (InTrainerHill()) { @@ -1752,58 +1752,58 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY) } else { - objectCount = gMapHeader.events->eventObjectCount; + objectCount = gMapHeader.events->objectEventCount; } for (i = 0; i < objectCount; i++) { - struct EventObjectTemplate *template = &gSaveBlock1Ptr->eventObjectTemplates[i]; + struct ObjectEventTemplate *template = &gSaveBlock1Ptr->objectEventTemplates[i]; s16 npcX = template->x + 7; s16 npcY = template->y + 7; if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX && !FlagGet(template->flagId)) - TrySpawnEventObjectTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); + TrySpawnObjectEventTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } } } -void RemoveEventObjectsOutsideView(void) +void RemoveObjectEventsOutsideView(void) { u8 i, j; bool8 isActiveLinkPlayer; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerEventObjects); j++) + for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerObjectEvents); j++) { - if (gLinkPlayerEventObjects[j].active && i == gLinkPlayerEventObjects[j].eventObjId) + if (gLinkPlayerObjectEvents[j].active && i == gLinkPlayerObjectEvents[j].objEventId) isActiveLinkPlayer = TRUE; } if (!isActiveLinkPlayer) { - struct EventObject *eventObject = &gEventObjects[i]; + struct ObjectEvent *objectEvent = &gObjectEvents[i]; - if (eventObject->active && !eventObject->isPlayer) - RemoveEventObjectIfOutsideView(eventObject); + if (objectEvent->active && !objectEvent->isPlayer) + RemoveObjectEventIfOutsideView(objectEvent); } } } -static void RemoveEventObjectIfOutsideView(struct EventObject *eventObject) +static void RemoveObjectEventIfOutsideView(struct ObjectEvent *objectEvent) { s16 left = gSaveBlock1Ptr->pos.x - 2; s16 right = gSaveBlock1Ptr->pos.x + 17; s16 top = gSaveBlock1Ptr->pos.y; s16 bottom = gSaveBlock1Ptr->pos.y + 16; - if (eventObject->currentCoords.x >= left && eventObject->currentCoords.x <= right - && eventObject->currentCoords.y >= top && eventObject->currentCoords.y <= bottom) + if (objectEvent->currentCoords.x >= left && objectEvent->currentCoords.x <= right + && objectEvent->currentCoords.y >= top && objectEvent->currentCoords.y <= bottom) return; - if (eventObject->initialCoords.x >= left && eventObject->initialCoords.x <= right - && eventObject->initialCoords.y >= top && eventObject->initialCoords.y <= bottom) + if (objectEvent->initialCoords.x >= left && objectEvent->initialCoords.x <= right + && objectEvent->initialCoords.y >= top && objectEvent->initialCoords.y <= bottom) return; - RemoveEventObject(eventObject); + RemoveObjectEvent(objectEvent); } void sub_808E16C(s16 x, s16 y) @@ -1813,7 +1813,7 @@ void sub_808E16C(s16 x, s16 y) ClearPlayerAvatarInfo(); for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { sub_808E1B8(i, x, y); } @@ -1821,32 +1821,32 @@ void sub_808E16C(s16 x, s16 y) CreateReflectionEffectSprites(); } -static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) +static void sub_808E1B8(u8 objectEventId, s16 x, s16 y) { u8 spriteId; u8 paletteSlot; struct Sprite *sprite; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct SpriteTemplate spriteTemplate; struct SpriteFrameImage spriteFrameImage; const struct SubspriteTable *subspriteTables; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; #define i spriteId - for (i = 0; i < ARRAY_COUNT(gLinkPlayerEventObjects); i++) + for (i = 0; i < ARRAY_COUNT(gLinkPlayerObjectEvents); i++) { - if (gLinkPlayerEventObjects[i].active && eventObjectId == gLinkPlayerEventObjects[i].eventObjId) + if (gLinkPlayerObjectEvents[i].active && objectEventId == gLinkPlayerObjectEvents[i].objEventId) { return; } } #undef i - eventObject = &gEventObjects[eventObjectId]; + objectEvent = &gObjectEvents[objectEventId]; subspriteTables = NULL; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); spriteFrameImage.size = graphicsInfo->size; - MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEvent->graphicsId, objectEvent->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; paletteSlot = graphicsInfo->paletteSlot; @@ -1868,16 +1868,16 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; - sub_8092FF0(x + eventObject->currentCoords.x, y + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8092FF0(x + objectEvent->currentCoords.x, y + objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->images = graphicsInfo->images; - if (eventObject->movementType == MOVEMENT_TYPE_PLAYER) + if (objectEvent->movementType == MOVEMENT_TYPE_PLAYER) { - SetPlayerAvatarEventObjectIdAndObjectId(eventObjectId, spriteId); - eventObject->warpArrowSpriteId = CreateWarpArrowSprite(); + SetPlayerAvatarObjectEventIdAndObjectId(objectEventId, spriteId); + objectEvent->warpArrowSpriteId = CreateWarpArrowSprite(); } if (subspriteTables != NULL) { @@ -1885,46 +1885,46 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) } sprite->oam.paletteNum = paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = eventObjectId; - eventObject->spriteId = spriteId; - if (!eventObject->inanimate && eventObject->movementType != MOVEMENT_TYPE_PLAYER) + sprite->data[0] = objectEventId; + objectEvent->spriteId = spriteId; + if (!objectEvent->inanimate && objectEvent->movementType != MOVEMENT_TYPE_PLAYER) { - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objectEvent->facingDirection)); } - sub_808E38C(eventObject); - SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); + sub_808E38C(objectEvent); + SetObjectSubpriorityByZCoord(objectEvent->previousElevation, sprite, 1); } } -static void sub_808E38C(struct EventObject *eventObject) +static void sub_808E38C(struct ObjectEvent *objectEvent) { - eventObject->singleMovementActive = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->hasShadow = FALSE; - eventObject->hasReflection = FALSE; - eventObject->inShortGrass = FALSE; - eventObject->inShallowFlowingWater = FALSE; - eventObject->inSandPile = FALSE; - eventObject->inHotSprings = FALSE; - EventObjectClearHeldMovement(eventObject); + objectEvent->singleMovementActive = FALSE; + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->hasShadow = FALSE; + objectEvent->hasReflection = FALSE; + objectEvent->inShortGrass = FALSE; + objectEvent->inShallowFlowingWater = FALSE; + objectEvent->inSandPile = FALSE; + objectEvent->inHotSprings = FALSE; + ObjectEventClearHeldMovement(objectEvent); } -static void SetPlayerAvatarEventObjectIdAndObjectId(u8 eventObjectId, u8 spriteId) +static void SetPlayerAvatarObjectEventIdAndObjectId(u8 objectEventId, u8 spriteId) { - gPlayerAvatar.eventObjectId = eventObjectId; + gPlayerAvatar.objectEventId = objectEventId; gPlayerAvatar.spriteId = spriteId; - gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gEventObjects[eventObjectId].graphicsId); - SetPlayerAvatarExtraStateTransition(gEventObjects[eventObjectId].graphicsId, 0x20); + gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gObjectEvents[objectEventId].graphicsId); + SetPlayerAvatarExtraStateTransition(gObjectEvents[objectEventId].graphicsId, 0x20); } -void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId) +void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *sprite; u8 paletteSlot; - graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - sprite = &gSprites[eventObject->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); + sprite = &gSprites[objectEvent->spriteId]; paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1945,85 +1945,85 @@ void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId) sprite->anims = graphicsInfo->anims; sprite->subspriteTables = graphicsInfo->subspriteTables; sprite->oam.paletteNum = paletteSlot; - eventObject->inanimate = graphicsInfo->inanimate; - eventObject->graphicsId = graphicsId; - SetSpritePosToMapCoords(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + objectEvent->inanimate = graphicsInfo->inanimate; + objectEvent->graphicsId = graphicsId; + SetSpritePosToMapCoords(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - if (eventObject->trackedByCamera) + if (objectEvent->trackedByCamera) { CameraObjectReset1(); } } -void EventObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) +void ObjectEventSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - EventObjectSetGraphicsId(&gEventObjects[eventObjectId], graphicsId); + ObjectEventSetGraphicsId(&gObjectEvents[objectEventId], graphicsId); } } -void EventObjectTurn(struct EventObject *eventObject, u8 direction) +void ObjectEventTurn(struct ObjectEvent *objectEvent, u8 direction) { - SetEventObjectDirection(eventObject, direction); - if (!eventObject->inanimate) + SetObjectEventDirection(objectEvent, direction); + if (!objectEvent->inanimate) { - StartSpriteAnim(&gSprites[eventObject->spriteId], GetFaceDirectionAnimNum(eventObject->facingDirection)); - SeekSpriteAnim(&gSprites[eventObject->spriteId], 0); + StartSpriteAnim(&gSprites[objectEvent->spriteId], GetFaceDirectionAnimNum(objectEvent->facingDirection)); + SeekSpriteAnim(&gSprites[objectEvent->spriteId], 0); } } -void EventObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) +void ObjectEventTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - EventObjectTurn(&gEventObjects[eventObjectId], direction); + ObjectEventTurn(&gObjectEvents[objectEventId], direction); } } void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction) { - EventObjectTurn(&gEventObjects[playerAvatar->eventObjectId], direction); + ObjectEventTurn(&gObjectEvents[playerAvatar->objectEventId], direction); } -static void get_berry_tree_graphics(struct EventObject *eventObject, struct Sprite *sprite) +static void get_berry_tree_graphics(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 berryStage; u8 berryId; - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->invisible = TRUE; - berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); + berryStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId); if (berryStage != 0) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->invisible = FALSE; - berryId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1; + berryId = GetBerryTypeByBerryTreeId(objectEvent->trainerRange_berryTreeId) - 1; berryStage--; if (berryId > ITEM_TO_BERRY(LAST_BERRY_INDEX)) berryId = 0; - EventObjectSetGraphicsId(eventObject, gBerryTreeEventObjectGraphicsIdTablePointers[berryId][berryStage]); + ObjectEventSetGraphicsId(objectEvent, gBerryTreeObjectEventGraphicsIdTablePointers[berryId][berryStage]); sprite->images = gBerryTreePicTablePointers[berryId]; sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage]; StartSpriteAnim(sprite, berryStage); } } -const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId) +const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId) { u8 bard; if (graphicsId >= SPRITE_VAR) { - graphicsId = VarGetEventObjectGraphicsId(graphicsId - SPRITE_VAR); + graphicsId = VarGetObjectEventGraphicsId(graphicsId - SPRITE_VAR); } if (graphicsId == EVENT_OBJ_GFX_BARD) { @@ -2034,83 +2034,83 @@ const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId) { graphicsId = EVENT_OBJ_GFX_NINJA_BOY; } - return gEventObjectGraphicsInfoPointers[graphicsId]; + return gObjectEventGraphicsInfoPointers[graphicsId]; } -static void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject) +static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *objectEvent) { - if (eventObject->graphicsId >= SPRITE_VAR) + if (objectEvent->graphicsId >= SPRITE_VAR) { - eventObject->graphicsId = VarGetEventObjectGraphicsId(eventObject->graphicsId - SPRITE_VAR); + objectEvent->graphicsId = VarGetObjectEventGraphicsId(objectEvent->graphicsId - SPRITE_VAR); } } void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 state) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - gEventObjects[eventObjectId].invisible = state; + gObjectEvents[objectEventId].invisible = state; } } -void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup) +void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup) { - *(u8*)(localId) = eventObject->localId; - *(u8*)(mapNum) = eventObject->mapNum; - *(u8*)(mapGroup) = eventObject->mapGroup; + *(u8*)(localId) = objectEvent->localId; + *(u8*)(mapNum) = objectEvent->mapNum; + *(u8*)(mapGroup) = objectEvent->mapGroup; } void sub_808E75C(s16 x, s16 y) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; - eventObjectId = GetEventObjectIdByXY(x, y); - if (eventObjectId != EVENT_OBJECTS_COUNT) + objectEventId = GetObjectEventIdByXY(x, y); + if (objectEventId != EVENT_OBJECTS_COUNT) { - eventObject = &gEventObjects[eventObjectId]; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->triggerGroundEffectsOnMove = TRUE; } } void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; struct Sprite *sprite; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - eventObject = &gEventObjects[eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; - eventObject->fixedPriority = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; + objectEvent->fixedPriority = TRUE; sprite->subpriority = subpriority; } } void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - eventObject = &gEventObjects[eventObjectId]; - eventObject->fixedPriority = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->fixedPriority = FALSE; + objectEvent->triggerGroundEffectsOnMove = TRUE; } } void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 eventObjectId; + u8 objectEventId; struct Sprite *sprite; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - sprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + sprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->pos2.x = x; sprite->pos2.y = y; } @@ -2122,23 +2122,23 @@ void FreeAndReserveObjectSpritePalettes(void) gReservedSpritePaletteCount = 12; } -static void LoadEventObjectPalette(u16 paletteTag) +static void LoadObjectEventPalette(u16 paletteTag) { - u16 i = FindEventObjectPaletteIndexByTag(paletteTag); + u16 i = FindObjectEventPaletteIndexByTag(paletteTag); if (i != EVENT_OBJ_PAL_TAG_NONE) // always true { - sub_808E8F4(&sEventObjectSpritePalettes[i]); + sub_808E8F4(&sObjectEventSpritePalettes[i]); } } -void Unused_LoadEventObjectPaletteSet(u16 *paletteTags) +void Unused_LoadObjectEventPaletteSet(u16 *paletteTags) { u8 i; for (i = 0; paletteTags[i] != EVENT_OBJ_PAL_TAG_NONE; i++) { - LoadEventObjectPalette(paletteTags[i]); + LoadObjectEventPalette(paletteTags[i]); } } @@ -2153,9 +2153,9 @@ static u8 sub_808E8F4(const struct SpritePalette *spritePalette) void PatchObjectPalette(u16 paletteTag, u8 paletteSlot) { - u8 paletteIndex = FindEventObjectPaletteIndexByTag(paletteTag); + u8 paletteIndex = FindObjectEventPaletteIndexByTag(paletteTag); - LoadPalette(sEventObjectSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); + LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); } void PatchObjectPaletteRange(const u16 *paletteTags, u8 minSlot, u8 maxSlot) @@ -2168,13 +2168,13 @@ void PatchObjectPaletteRange(const u16 *paletteTags, u8 minSlot, u8 maxSlot) } } -static u8 FindEventObjectPaletteIndexByTag(u16 tag) +static u8 FindObjectEventPaletteIndexByTag(u16 tag) { u8 i; - for (i = 0; sEventObjectSpritePalettes[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; sObjectEventSpritePalettes[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) { - if (sEventObjectSpritePalettes[i].tag == tag) + if (sObjectEventSpritePalettes[i].tag == tag) { return i; } @@ -2218,65 +2218,65 @@ static void sub_808EAB0(u16 tag, u8 slot) PatchObjectPalette(tag, slot); } -void unref_sub_808EAC4(struct EventObject *eventObject, s16 x, s16 y) +void unref_sub_808EAC4(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = eventObject->currentCoords.x; - eventObject->previousCoords.y = eventObject->currentCoords.y; - eventObject->currentCoords.x += x; - eventObject->currentCoords.y += y; + objectEvent->previousCoords.x = objectEvent->currentCoords.x; + objectEvent->previousCoords.y = objectEvent->currentCoords.y; + objectEvent->currentCoords.x += x; + objectEvent->currentCoords.y += y; } -void ShiftEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) +void ShiftObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = eventObject->currentCoords.x; - eventObject->previousCoords.y = eventObject->currentCoords.y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; + objectEvent->previousCoords.x = objectEvent->currentCoords.x; + objectEvent->previousCoords.y = objectEvent->currentCoords.y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; } -static void SetEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) +static void SetObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = x; - eventObject->previousCoords.y = y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; + objectEvent->previousCoords.x = x; + objectEvent->previousCoords.y = y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; } -void MoveEventObjectToMapCoords(struct EventObject *eventObject, s16 x, s16 y) +void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - sprite = &gSprites[eventObject->spriteId]; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); - SetEventObjectCoords(eventObject, x, y); - SetSpritePosToMapCoords(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sprite = &gSprites[objectEvent->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); + SetObjectEventCoords(objectEvent, x, y); + SetSpritePosToMapCoords(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - sub_808E38C(eventObject); - if (eventObject->trackedByCamera) + sub_808E38C(objectEvent); + if (objectEvent->trackedByCamera) CameraObjectReset1(); } -void TryMoveEventObjectToMapCoords(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) +void TryMoveObjectEventToMapCoords(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { x += 7; y += 7; - MoveEventObjectToMapCoords(&gEventObjects[eventObjectId], x, y); + MoveObjectEventToMapCoords(&gObjectEvents[objectEventId], x, y); } } -void ShiftStillEventObjectCoords(struct EventObject *eventObject) +void ShiftStillObjectEventCoords(struct ObjectEvent *objectEvent) { - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); } -void UpdateEventObjectCoordsForCameraUpdate(void) +void UpdateObjectEventCoordsForCameraUpdate(void) { u8 i; s16 dx; @@ -2288,28 +2288,28 @@ void UpdateEventObjectCoordsForCameraUpdate(void) dy = gCamera.y; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { - gEventObjects[i].initialCoords.x -= dx; - gEventObjects[i].initialCoords.y -= dy; - gEventObjects[i].currentCoords.x -= dx; - gEventObjects[i].currentCoords.y -= dy; - gEventObjects[i].previousCoords.x -= dx; - gEventObjects[i].previousCoords.y -= dy; + gObjectEvents[i].initialCoords.x -= dx; + gObjectEvents[i].initialCoords.y -= dy; + gObjectEvents[i].currentCoords.x -= dx; + gObjectEvents[i].currentCoords.y -= dy; + gObjectEvents[i].previousCoords.x -= dx; + gObjectEvents[i].previousCoords.y -= dy; } } } } -u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z) +u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { - if (gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y && EventObjectDoesZCoordMatch(&gEventObjects[i], z)) + if (gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y && ObjectEventDoesZCoordMatch(&gObjectEvents[i], z)) { return i; } @@ -2318,20 +2318,20 @@ u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z) return EVENT_OBJECTS_COUNT; } -static bool8 EventObjectDoesZCoordMatch(struct EventObject *eventObject, u8 z) +static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *objectEvent, u8 z) { - if (eventObject->currentElevation != 0 && z != 0 && eventObject->currentElevation != z) + if (objectEvent->currentElevation != 0 && z != 0 && objectEvent->currentElevation != z) { return FALSE; } return TRUE; } -void UpdateEventObjectsForCameraUpdate(s16 x, s16 y) +void UpdateObjectEventsForCameraUpdate(s16 x, s16 y) { - UpdateEventObjectCoordsForCameraUpdate(); - TrySpawnEventObjects(x, y); - RemoveEventObjectsOutsideView(); + UpdateObjectEventCoordsForCameraUpdate(); + TrySpawnObjectEvents(x, y); + RemoveObjectEventsOutsideView(); } u8 AddCameraObject(u8 linkedSpriteId) @@ -2470,91 +2470,91 @@ u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) return MAX_SPRITES; } -void SetEventObjectDirection(struct EventObject *eventObject, u8 direction) +void SetObjectEventDirection(struct ObjectEvent *objectEvent, u8 direction) { s8 d2; - eventObject->previousMovementDirection = eventObject->facingDirection; - if (!eventObject->facingDirectionLocked) + objectEvent->previousMovementDirection = objectEvent->facingDirection; + if (!objectEvent->facingDirectionLocked) { d2 = direction; - eventObject->facingDirection = d2; + objectEvent->facingDirection = d2; } - eventObject->movementDirection = direction; + objectEvent->movementDirection = direction; } -static const u8 *GetEventObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static const u8 *GetObjectEventScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; + return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; } -const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId) +const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId) { - return GetEventObjectScriptPointerByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); + return GetObjectEventScriptPointerByLocalIdAndMap(gObjectEvents[objectEventId].localId, gObjectEvents[objectEventId].mapNum, gObjectEvents[objectEventId].mapGroup); } -static u16 GetEventObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static u16 GetObjectEventFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; + return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; } -static u16 GetEventObjectFlagIdByEventObjectId(u8 eventObjectId) +static u16 GetObjectEventFlagIdByObjectEventId(u8 objectEventId) { - return GetEventObjectFlagIdByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); + return GetObjectEventFlagIdByLocalIdAndMap(gObjectEvents[objectEventId].localId, gObjectEvents[objectEventId].mapNum, gObjectEvents[objectEventId].mapGroup); } u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { return 0xFF; } - return gEventObjects[eventObjectId].trainerType; + return gObjectEvents[objectEventId].trainerType; } -u8 sub_808F0BC(u8 eventObjectId) +u8 sub_808F0BC(u8 objectEventId) { - return gEventObjects[eventObjectId].trainerType; + return gObjectEvents[objectEventId].trainerType; } u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { return 0xFF; } - return gEventObjects[eventObjectId].trainerRange_berryTreeId; + return gObjectEvents[objectEventId].trainerRange_berryTreeId; } -u8 EventObjectGetBerryTreeId(u8 eventObjectId) +u8 ObjectEventGetBerryTreeId(u8 objectEventId) { - return gEventObjects[eventObjectId].trainerRange_berryTreeId; + return gObjectEvents[objectEventId].trainerRange_berryTreeId; } -static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - struct EventObjectTemplate *templates; + struct ObjectEventTemplate *templates; const struct MapHeader *mapHeader; u8 count; if (gSaveBlock1Ptr->location.mapNum == mapNum && gSaveBlock1Ptr->location.mapGroup == mapGroup) { - templates = gSaveBlock1Ptr->eventObjectTemplates; - count = gMapHeader.events->eventObjectCount; + templates = gSaveBlock1Ptr->objectEventTemplates; + count = gMapHeader.events->objectEventCount; } else { mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); - templates = mapHeader->events->eventObjects; - count = mapHeader->events->eventObjectCount; + templates = mapHeader->events->objectEvents; + count = mapHeader->events->objectEventCount; } - return FindEventObjectTemplateByLocalId(localId, templates, count); + return FindObjectEventTemplateByLocalId(localId, templates, count); } -static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count) +static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId, struct ObjectEventTemplate *templates, u8 count) { u8 i; @@ -2568,81 +2568,81 @@ static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, return NULL; } -struct EventObjectTemplate *GetBaseTemplateForEventObject(const struct EventObject *eventObject) +struct ObjectEventTemplate *GetBaseTemplateForObjectEvent(const struct ObjectEvent *objectEvent) { int i; - if (eventObject->mapNum != gSaveBlock1Ptr->location.mapNum || eventObject->mapGroup != gSaveBlock1Ptr->location.mapGroup) + if (objectEvent->mapNum != gSaveBlock1Ptr->location.mapNum || objectEvent->mapGroup != gSaveBlock1Ptr->location.mapGroup) { return NULL; } for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { - if (eventObject->localId == gSaveBlock1Ptr->eventObjectTemplates[i].localId) + if (objectEvent->localId == gSaveBlock1Ptr->objectEventTemplates[i].localId) { - return &gSaveBlock1Ptr->eventObjectTemplates[i]; + return &gSaveBlock1Ptr->objectEventTemplates[i]; } } return NULL; } -void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject) +void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; - eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); - if (eventObjectTemplate != NULL) + objectEventTemplate = GetBaseTemplateForObjectEvent(objectEvent); + if (objectEventTemplate != NULL) { - eventObjectTemplate->x = eventObject->currentCoords.x - 7; - eventObjectTemplate->y = eventObject->currentCoords.y - 7; + objectEventTemplate->x = objectEvent->currentCoords.x - 7; + objectEventTemplate->y = objectEvent->currentCoords.y - 7; } } -static void OverrideEventObjectTemplateScript(const struct EventObject *eventObject, const u8 *script) +static void OverrideObjectEventTemplateScript(const struct ObjectEvent *objectEvent, const u8 *script) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; - eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); - if (eventObjectTemplate) - eventObjectTemplate->script = script; + objectEventTemplate = GetBaseTemplateForObjectEvent(objectEvent); + if (objectEventTemplate) + objectEventTemplate->script = script; } -void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType) +void TryOverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent, u8 movementType) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; - eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); - if (eventObjectTemplate != NULL) + objectEventTemplate = GetBaseTemplateForObjectEvent(objectEvent); + if (objectEventTemplate != NULL) { - eventObjectTemplate->movementType = movementType; + objectEventTemplate->movementType = movementType; } } -void TryOverrideEventObjectTemplateCoords(u8 localId, u8 mapNum, u8 mapGroup) +void TryOverrideObjectEventTemplateCoords(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) - OverrideTemplateCoordsForEventObject(&gEventObjects[eventObjectId]); + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) + OverrideTemplateCoordsForObjectEvent(&gObjectEvents[objectEventId]); } void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorationCategory) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { switch (decorationCategory) { case DECORCAT_DOLL: - OverrideEventObjectTemplateScript(&gEventObjects[eventObjectId], SecretBase_EventScript_DollInteract); + OverrideObjectEventTemplateScript(&gObjectEvents[objectEventId], SecretBase_EventScript_DollInteract); break; case DECORCAT_CUSHION: - OverrideEventObjectTemplateScript(&gEventObjects[eventObjectId], SecretBase_EventScript_CushionInteract); + OverrideObjectEventTemplateScript(&gObjectEvents[objectEventId], SecretBase_EventScript_CushionInteract); break; } } } -void InitEventObjectPalettes(u8 palSlot) +void InitObjectEventPalettes(u8 palSlot) { FreeAndReserveObjectSpritePalettes(); sCurrentSpecialObjectPaletteTag = EVENT_OBJ_PAL_TAG_NONE; @@ -2679,23 +2679,23 @@ u16 GetObjectPaletteTag(u8 palSlot) movement_type_empty_callback(MovementType_None) movement_type_def(MovementType_WanderAround, gMovementTypeFuncs_WanderAround) -bool8 MovementType_WanderAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (!EventObjectExecSingleMovementAction(eventObject, sprite)) + if (!ObjectEventExecSingleMovementAction(objectEvent, sprite)) { return FALSE; } @@ -2704,7 +2704,7 @@ bool8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sp return TRUE; } -bool8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { @@ -2714,40 +2714,40 @@ bool8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementType_WanderAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; u8 chosenDirection; memcpy(directions, gStandardDirections, sizeof directions); chosenDirection = directions[Random() & 3]; - SetEventObjectDirection(eventObject, chosenDirection); + SetObjectEventDirection(objectEvent, chosenDirection); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, chosenDirection)) + if (GetCollisionInDirection(objectEvent, chosenDirection)) sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderAround_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderAround_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) +bool8 ObjectEventIsTrainerAndCloseToPlayer(struct ObjectEvent *objectEvent) { s16 playerX; s16 playerY; @@ -2762,17 +2762,17 @@ bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) { return FALSE; } - if (eventObject->trainerType != 1 && eventObject->trainerType != 3) + if (objectEvent->trainerType != 1 && objectEvent->trainerType != 3) { return FALSE; } PlayerGetDestCoords(&playerX, &playerY); - objX = eventObject->currentCoords.x; - objY = eventObject->currentCoords.y; - minX = objX - eventObject->trainerRange_berryTreeId; - minY = objY - eventObject->trainerRange_berryTreeId; - maxX = objX + eventObject->trainerRange_berryTreeId; - maxY = objY + eventObject->trainerRange_berryTreeId; + objX = objectEvent->currentCoords.x; + objY = objectEvent->currentCoords.y; + minX = objX - objectEvent->trainerRange_berryTreeId; + minY = objY - objectEvent->trainerRange_berryTreeId; + maxX = objX + objectEvent->trainerRange_berryTreeId; + maxY = objY + objectEvent->trainerRange_berryTreeId; if (minX > playerX || maxX < playerX || minY > playerY || maxY < playerY) { return FALSE; @@ -2971,18 +2971,18 @@ u8 GetLimitedVectorDirection_SouthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 movementType) +u8 TryGetTrainerEncounterDirection(struct ObjectEvent *objectEvent, u8 movementType) { s16 dx, dy; s16 absdx, absdy; - if (!EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (!ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { return 0; } PlayerGetDestCoords(&dx, &dy); - dx -= eventObject->currentCoords.x; - dy -= eventObject->currentCoords.y; + dx -= objectEvent->currentCoords.x; + dy -= objectEvent->currentCoords.y; absdx = dx; absdy = dy; if (absdx < 0) @@ -2998,34 +2998,34 @@ u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 movementT movement_type_def(MovementType_LookAround, gMovementTypeFuncs_LookAround) -bool8 MovementType_LookAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_LookAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_LookAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3033,39 +3033,39 @@ bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Spri return FALSE; } -bool8 MovementType_LookAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gStandardDirections, sizeof directions); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_ANY); if (direction == DIR_NONE) direction = directions[Random() & 3]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_WanderUpAndDown, gMovementTypeFuncs_WanderUpAndDown) -bool8 MovementType_WanderUpAndDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (!EventObjectExecSingleMovementAction(eventObject, sprite)) + if (!ObjectEventExecSingleMovementAction(objectEvent, sprite)) { return FALSE; } @@ -3074,7 +3074,7 @@ bool8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct return TRUE; } -bool8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { @@ -3084,33 +3084,33 @@ bool8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_WanderUpAndDown_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndDownDirections, sizeof directions); direction = directions[Random() & 1]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, direction)) + if (GetCollisionInDirection(objectEvent, direction)) sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -3118,23 +3118,23 @@ bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct movement_type_def(MovementType_WanderLeftAndRight, gMovementTypeFuncs_WanderLeftAndRight) -bool8 MovementType_WanderLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (!EventObjectExecSingleMovementAction(eventObject, sprite)) + if (!ObjectEventExecSingleMovementAction(objectEvent, sprite)) { return FALSE; } @@ -3143,7 +3143,7 @@ bool8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, str return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { @@ -3153,33 +3153,33 @@ bool8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_WanderLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gLeftAndRightDirections, sizeof directions); direction = directions[Random() & 1]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, direction)) + if (GetCollisionInDirection(objectEvent, direction)) sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -3187,17 +3187,17 @@ bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, str movement_type_def(MovementType_FaceDirection, gMovementTypeFuncs_FaceDirection) -bool8 MovementType_FaceDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 2; return TRUE; @@ -3205,44 +3205,44 @@ bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceDirection_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; return FALSE; } -static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite); -extern bool8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *eventObject, struct Sprite *sprite); +static bool8 ObjectEventCB2_BerryTree(struct ObjectEvent *objectEvent, struct Sprite *sprite); +extern bool8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct ObjectEvent *objectEvent, struct Sprite *sprite); void MovementType_BerryTreeGrowth(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - eventObject = &gEventObjects[sprite->data[0]]; + objectEvent = &gObjectEvents[sprite->data[0]]; if (!(sprite->data[7] & 1)) { - get_berry_tree_graphics(eventObject, sprite); + get_berry_tree_graphics(objectEvent, sprite); sprite->data[7] |= 1; } - UpdateEventObjectCurrentMovement(eventObject, sprite, EventObjectCB2_BerryTree); + UpdateObjectEventCurrentMovement(objectEvent, sprite, ObjectEventCB2_BerryTree); } -static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 ObjectEventCB2_BerryTree(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](eventObject, sprite); + return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](objectEvent, sprite); } -bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 berryStage; - ClearEventObjectMovement(eventObject, sprite); - eventObject->invisible = TRUE; + ClearObjectEventMovement(objectEvent, sprite); + objectEvent->invisible = TRUE; sprite->invisible = TRUE; - berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); + berryStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId); if (berryStage == 0) { if (!(sprite->data[7] & 4) && sprite->animNum == 4) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); @@ -3250,7 +3250,7 @@ bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct } return FALSE; } - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->invisible = FALSE; berryStage --; if (sprite->animNum != berryStage) @@ -3258,15 +3258,15 @@ bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct sprite->data[1] = 2; return TRUE; } - get_berry_tree_graphics(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + get_berry_tree_graphics(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 0; return TRUE; @@ -3274,28 +3274,28 @@ bool8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_BerryTreeGrowth_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 1; + objectEvent->singleMovementActive = 1; sprite->data[1] = 3; sprite->data[2] = 0; sprite->data[7] |= 2; - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); return TRUE; } -bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->data[2]++; - eventObject->invisible = (sprite->data[2] & 0x02) >> 1; + objectEvent->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) { - get_berry_tree_graphics(eventObject, sprite); + get_berry_tree_graphics(objectEvent, sprite); sprite->data[1] = 4; sprite->data[2] = 0; return TRUE; @@ -3303,10 +3303,10 @@ bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->data[2]++; - eventObject->invisible = (sprite->data[2] & 0x02) >> 1; + objectEvent->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) { @@ -3319,34 +3319,34 @@ bool8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct movement_type_def(MovementType_FaceDownAndUp, gMovementTypeFuncs_FaceDownAndUp) -bool8 MovementType_FaceDownAndUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndUp_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3354,51 +3354,51 @@ bool8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceDownAndUp_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndDownDirections, sizeof gUpAndDownDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_SOUTH); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceLeftAndRight, gMovementTypeFuncs_FaceLeftAndRight) -bool8 MovementType_FaceLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3406,51 +3406,51 @@ bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementType_FaceLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gLeftAndRightDirections, sizeof gLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_EAST_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_EAST_WEST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpAndLeft, gMovementTypeFuncs_FaceUpAndLeft) -bool8 MovementType_FaceUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3458,51 +3458,51 @@ bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndLeftDirections, sizeof gUpAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_WEST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpAndRight, gMovementTypeFuncs_FaceUpAndRight) -bool8 MovementType_FaceUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3510,51 +3510,51 @@ bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_FaceUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndRightDirections, sizeof gUpAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_EAST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_EAST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownAndLeft, gMovementTypeFuncs_FaceDownAndLeft) -bool8 MovementType_FaceDownAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3562,51 +3562,51 @@ bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_FaceDownAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gDownAndLeftDirections, sizeof gDownAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_SOUTH_WEST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownAndRight, gMovementTypeFuncs_FaceDownAndRight) -bool8 MovementType_FaceDownAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3614,51 +3614,51 @@ bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementType_FaceDownAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gDownAndRightDirections, sizeof gDownAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_EAST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_SOUTH_EAST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownUpAndLeft, gMovementTypeFuncs_FaceDownUpAndLeft) -bool8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3666,51 +3666,51 @@ bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownUpAndLeftDirections, sizeof gDownUpAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_SOUTH_WEST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownUpAndRight, gMovementTypeFuncs_FaceDownUpAndRight) -bool8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3718,51 +3718,51 @@ bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownUpAndRightDirections, sizeof gDownUpAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_EAST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_SOUTH_EAST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpRightAndLeft, gMovementTypeFuncs_FaceUpLeftAndRight) -bool8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3770,51 +3770,51 @@ bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gUpLeftAndRightDirections, sizeof gUpLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_EAST_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_EAST_WEST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownRightAndLeft, gMovementTypeFuncs_FaceDownLeftAndRight) -bool8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3822,34 +3822,34 @@ bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, s return FALSE; } -bool8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownLeftAndRightDirections, sizeof gDownLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_EAST_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_SOUTH_EAST_WEST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_RotateCounterclockwise, gMovementTypeFuncs_RotateCounterclockwise) -bool8 MovementType_RotateCounterclockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, 48); sprite->data[1] = 2; @@ -3857,43 +3857,43 @@ bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementType_RotateCounterclockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_RotateCounterclockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[5]; memcpy(directions, gCounterclockwiseDirections, sizeof gCounterclockwiseDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_ANY); if (direction == 0) { - direction = directions[eventObject->facingDirection]; + direction = directions[objectEvent->facingDirection]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 0; return TRUE; } movement_type_def(MovementType_RotateClockwise, gMovementTypeFuncs_RotateClockwise) -bool8 MovementType_RotateClockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, 48); sprite->data[1] = 2; @@ -3901,132 +3901,132 @@ bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_RotateClockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_RotateClockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[5]; memcpy(directions, gClockwiseDirections, sizeof gClockwiseDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_ANY); if (direction == 0) { - direction = directions[eventObject->facingDirection]; + direction = directions[objectEvent->facingDirection]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 0; return TRUE; } movement_type_def(MovementType_WalkBackAndForth, gMovementTypeFuncs_WalkBackAndForth) -bool8 MovementType_WalkBackAndForth_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; - direction = gInitialMovementTypeFacingDirections[eventObject->movementType]; - if (eventObject->directionSequenceIndex) + direction = gInitialMovementTypeFacingDirections[objectEvent->movementType]; + if (objectEvent->directionSequenceIndex) { direction = GetOppositeDirection(direction); } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { bool8 collision; u8 movementActionId; - if (eventObject->directionSequenceIndex && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex && objectEvent->initialCoords.x == objectEvent->currentCoords.x && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 0; - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); + objectEvent->directionSequenceIndex = 0; + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); } - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); if (collision == COLLISION_OUTSIDE_RANGE) { - eventObject->directionSequenceIndex++; - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); + objectEvent->directionSequenceIndex++; + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); } if (collision) - movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection); + movementActionId = GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection); - EventObjectSetSingleMovement(eventObject, sprite, movementActionId); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, movementActionId); + objectEvent->singleMovementActive = 1; sprite->data[1] = 3; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 MovementType_WalkSequence_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MoveNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *route) +bool8 MoveNextDirectionInSequence(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 *route) { u8 collision; u8 movementActionId; - if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) - eventObject->directionSequenceIndex = 0; + if (objectEvent->directionSequenceIndex == 3 && objectEvent->initialCoords.x == objectEvent->currentCoords.x && objectEvent->initialCoords.y == objectEvent->currentCoords.y) + objectEvent->directionSequenceIndex = 0; - SetEventObjectDirection(eventObject, route[eventObject->directionSequenceIndex]); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); + SetObjectEventDirection(objectEvent, route[objectEvent->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); if (collision == COLLISION_OUTSIDE_RANGE) { - eventObject->directionSequenceIndex++; - SetEventObjectDirection(eventObject, route[eventObject->directionSequenceIndex]); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); + objectEvent->directionSequenceIndex++; + SetObjectEventDirection(objectEvent, route[objectEvent->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); } if (collision) - movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection); + movementActionId = GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection); - EventObjectSetSingleMovement(eventObject, sprite, movementActionId); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, movementActionId); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -4034,579 +4034,579 @@ bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sp movement_type_def(MovementType_WalkSequenceUpRightLeftDown, gMovementTypeFuncs_WalkSequenceUpRightLeftDown) -u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpRightLeftDownDirections)]; memcpy(directions, gUpRightLeftDownDirections, sizeof(gUpRightLeftDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightLeftDownUp, gMovementTypeFuncs_WalkSequenceRightLeftDownUp) -u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightLeftDownUpDirections)]; memcpy(directions, gRightLeftDownUpDirections, sizeof(gRightLeftDownUpDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownUpRightLeft, gMovementTypeFuncs_WalkSequenceDownUpRightLeft) -u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownUpRightLeftDirections)]; memcpy(directions, gDownUpRightLeftDirections, sizeof(gDownUpRightLeftDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftDownUpRight, gMovementTypeFuncs_WalkSequenceLeftDownUpRight) -u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftDownUpRightDirections)]; memcpy(directions, gLeftDownUpRightDirections, sizeof(gLeftDownUpRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpLeftRightDown, gMovementTypeFuncs_WalkSequenceUpLeftRightDown) -u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpLeftRightDownDirections)]; memcpy(directions, gUpLeftRightDownDirections, sizeof(gUpLeftRightDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftRightDownUp, gMovementTypeFuncs_WalkSequenceLeftRightDownUp) -u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftRightDownUpDirections)]; memcpy(directions, gLeftRightDownUpDirections, sizeof(gLeftRightDownUpDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownUpLeftRight, gMovementTypeFuncs_WalkSequenceDownUpLeftRight) -u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gStandardDirections)]; memcpy(directions, gStandardDirections, sizeof(gStandardDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightDownUpLeft, gMovementTypeFuncs_WalkSequenceRightDownUpLeft) -u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightDownUpLeftDirections)]; memcpy(directions, gRightDownUpLeftDirections, sizeof(gRightDownUpLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftUpDownRight, gMovementTypeFuncs_WalkSequenceLeftUpDownRight) -u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftUpDownRightDirections)]; memcpy(directions, gLeftUpDownRightDirections, sizeof(gLeftUpDownRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpDownRightLeft, gMovementTypeFuncs_WalkSequenceUpDownRightLeft) -u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpDownRightLeftDirections)]; memcpy(directions, gUpDownRightLeftDirections, sizeof(gUpDownRightLeftDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightLeftUpDown, gMovementTypeFuncs_WalkSequenceRightLeftUpDown) -u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightLeftUpDownDirections)]; memcpy(directions, gRightLeftUpDownDirections, sizeof(gRightLeftUpDownDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownRightLeftUp, gMovementTypeFuncs_WalkSequenceDownRightLeftUp) -u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownRightLeftUpDirections)]; memcpy(directions, gDownRightLeftUpDirections, sizeof(gDownRightLeftUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightUpDownLeft, gMovementTypeFuncs_WalkSequenceRightUpDownLeft) -u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightUpDownLeftDirections)]; memcpy(directions, gRightUpDownLeftDirections, sizeof(gRightUpDownLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpDownLeftRight, gMovementTypeFuncs_WalkSequenceUpDownLeftRight) -u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpDownLeftRightDirections)]; memcpy(directions, gUpDownLeftRightDirections, sizeof(gUpDownLeftRightDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftRightUpDown, gMovementTypeFuncs_WalkSequenceLeftRightUpDown) -u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftRightUpDownDirections)]; memcpy(directions, gLeftRightUpDownDirections, sizeof(gLeftRightUpDownDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownLeftRightUp, gMovementTypeFuncs_WalkSequenceDownLeftRightUp) -u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownLeftRightUpDirections)]; memcpy(directions, gDownLeftRightUpDirections, sizeof(gDownLeftRightUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpLeftDownRight, gMovementTypeFuncs_WalkSequenceUpLeftDownRight) -u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpLeftDownRightDirections)]; memcpy(directions, gUpLeftDownRightDirections, sizeof(gUpLeftDownRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownRightUpLeft, gMovementTypeFuncs_WalkSequenceDownRightUpLeft) -u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownRightUpLeftDirections)]; memcpy(directions, gDownRightUpLeftDirections, sizeof(gDownRightUpLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftDownRightUp, gMovementTypeFuncs_WalkSequenceLeftDownRightUp) -u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftDownRightUpDirections)]; memcpy(directions, gLeftDownRightUpDirections, sizeof(gLeftDownRightUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightUpLeftDown, gMovementTypeFuncs_WalkSequenceRightUpLeftDown) -u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightUpLeftDownDirections)]; memcpy(directions, gRightUpLeftDownDirections, sizeof(gRightUpLeftDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpRightDownLeft, gMovementTypeFuncs_WalkSequenceUpRightDownLeft) -u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpRightDownLeftDirections)]; memcpy(directions, gUpRightDownLeftDirections, sizeof(gUpRightDownLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownLeftUpRight, gMovementTypeFuncs_WalkSequenceDownLeftUpRight) -u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownLeftUpRightDirections)]; memcpy(directions, gDownLeftUpRightDirections, sizeof(gDownLeftUpRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftUpRightDown, gMovementTypeFuncs_WalkSequenceLeftUpRightDown) -u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftUpRightDownDirections)]; memcpy(directions, gLeftUpRightDownDirections, sizeof(gLeftUpRightDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightDownLeftUp, gMovementTypeFuncs_WalkSequenceRightDownLeftUp) -u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightDownLeftUpDirections)]; memcpy(directions, gRightDownLeftUpDirections, sizeof(gRightDownLeftUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_CopyPlayer, gMovementTypeFuncs_CopyPlayer) -bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - if (eventObject->directionSequenceIndex == 0) + ClearObjectEventMovement(objectEvent, sprite); + if (objectEvent->directionSequenceIndex == 0) { - eventObject->directionSequenceIndex = GetPlayerFacingDirection(); + objectEvent->directionSequenceIndex = GetPlayerFacingDirection(); } sprite->data[1] = 1; return TRUE; } -bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gObjectEvents[gPlayerAvatar.objectEventId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } - return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), NULL); + return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](objectEvent, sprite, GetPlayerMovementDirection(), NULL); } -bool8 MovementType_CopyPlayer_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 CopyablePlayerMovement_None(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_None(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { return FALSE; } -bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection))); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, playerDirection))); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - if (EventObjectIsFarawayIslandMew(eventObject)) + if (ObjectEventIsFarawayIslandMew(objectEvent)) { direction = GetMewMoveDirection(); if (direction == DIR_NONE) { direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); - eventObject->singleMovementActive = 1; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } } else { - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); } - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = 1; + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkFastMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastestMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkFastestMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_Slide(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetSlideMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetSlideMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 cph_IM_DIFFERENT(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 cph_IM_DIFFERENT(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectSetSingleMovement(eventObject, sprite, GetJumpInPlaceMovementAction(direction)); - eventObject->singleMovementActive = TRUE; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventSetSingleMovement(objectEvent, sprite, GetJumpInPlaceMovementAction(direction)); + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetJumpMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetJumpMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_Jump(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoordsInDirection(direction, &x, &y, 2, 2); - EventObjectSetSingleMovement(eventObject, sprite, GetJump2MovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + ObjectEventSetSingleMovement(objectEvent, sprite, GetJump2MovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerInGrass) -bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gObjectEvents[gPlayerAvatar.objectEventId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } - return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass); + return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](objectEvent, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass); } void MovementType_TreeDisguise(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) + objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->directionSequenceIndex == 0 || (objectEvent->directionSequenceIndex == 1 && !sprite->data[7])) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); - eventObject->directionSequenceIndex = 1; + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); + objectEvent->directionSequenceIndex = 1; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Disguise_Callback); } -static bool8 MovementType_Disguise_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Disguise_Callback(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); return FALSE; } void MovementType_MountainDisguise(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) + objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->directionSequenceIndex == 0 || (objectEvent->directionSequenceIndex == 1 && !sprite->data[7])) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); - eventObject->directionSequenceIndex = 1; + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); + objectEvent->directionSequenceIndex = 1; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Disguise_Callback); } void MovementType_Hidden(struct Sprite *sprite) { if (!sprite->data[7]) { - gEventObjects[sprite->data[0]].fixedPriority = TRUE; + gObjectEvents[sprite->data[0]].fixedPriority = TRUE; sprite->subspriteMode = 2; sprite->oam.priority = 3; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Hidden_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Hidden_Callback); } -static bool8 MovementType_Hidden_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Hidden_Callback(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return gMovementTypeFuncs_Hidden[sprite->data[1]](eventObject, sprite); + return gMovementTypeFuncs_Hidden[sprite->data[1]](objectEvent, sprite); } -bool8 MovementType_Hidden_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Hidden_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); return FALSE; } -bool8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_MoveInPlace_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 0; } @@ -4615,57 +4615,57 @@ bool8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Spr movement_type_def(MovementType_WalkInPlace, gMovementTypeFuncs_WalkInPlace) -bool8 MovementType_WalkInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceNormalMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_WalkSlowlyInPlace, gMovementTypeFuncs_WalkSlowlyInPlace) -bool8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceSlowMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceSlowMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_JogInPlace, gMovementTypeFuncs_JogInPlace) -bool8 MovementType_JogInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_JogInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceFastMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_RunInPlace, gMovementTypeFuncs_RunInPlace) -bool8 MovementType_RunInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RunInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_Invisible, gMovementTypeFuncs_Invisible) -bool8 MovementType_Invisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); - eventObject->invisible = TRUE; + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); + objectEvent->invisible = TRUE; sprite->data[1] = 1; return TRUE; } -bool8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 2; return TRUE; @@ -4673,18 +4673,18 @@ bool8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -bool8 MovementType_Invisible_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; return FALSE; } -static void ClearEventObjectMovement(struct EventObject *eventObject, struct Sprite *sprite) +static void ClearObjectEventMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 0; - eventObject->heldMovementActive = FALSE; - eventObject->heldMovementFinished = FALSE; - eventObject->movementActionId = 0xFF; + objectEvent->singleMovementActive = 0; + objectEvent->heldMovementActive = FALSE; + objectEvent->heldMovementFinished = FALSE; + objectEvent->movementActionId = 0xFF; sprite->data[1] = 0; } @@ -4777,11 +4777,11 @@ static const struct UnkStruct_085094AC *sub_8092A4C(const union AnimCmd *const * return NULL; } -void npc_apply_anim_looping(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) +void npc_apply_anim_looping(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { const struct UnkStruct_085094AC *unk85094AC; - if (!eventObject->inanimate) + if (!objectEvent->inanimate) { sprite->animNum = animNum; unk85094AC = sub_8092A4C(sprite->anims); @@ -4800,11 +4800,11 @@ void npc_apply_anim_looping(struct EventObject *eventObject, struct Sprite *spri } } -void obj_npc_animation_step(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) +void obj_npc_animation_step(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { const struct UnkStruct_085094AC *unk85094AC; - if (!eventObject->inanimate) + if (!objectEvent->inanimate) { u8 animPos; @@ -4841,13 +4841,13 @@ u8 GetDirectionToFace(s16 x1, s16 y1, s16 x2, s16 y2) return DIR_SOUTH; } -void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType) +void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType) { - eventObject->movementType = movementType; - eventObject->directionSequenceIndex = 0; - eventObject->playerCopyableMovement = 0; - gSprites[eventObject->spriteId].callback = sMovementTypeCallbacks[movementType]; - gSprites[eventObject->spriteId].data[1] = 0; + objectEvent->movementType = movementType; + objectEvent->directionSequenceIndex = 0; + objectEvent->playerCopyableMovement = 0; + gSprites[objectEvent->spriteId].callback = sMovementTypeCallbacks[movementType]; + gSprites[objectEvent->spriteId].data[1] = 0; } u8 GetTrainerFacingDirectionMovementType(u8 direction) @@ -4855,67 +4855,67 @@ u8 GetTrainerFacingDirectionMovementType(u8 direction) return gTrainerFacingDirectionMovementTypes[direction]; } -static u8 GetCollisionInDirection(struct EventObject *eventObject, u8 direction) +static u8 GetCollisionInDirection(struct ObjectEvent *objectEvent, u8 direction) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoords(direction, &x, &y); - return GetCollisionAtCoords(eventObject, x, y, direction); + return GetCollisionAtCoords(objectEvent, x, y, direction); } -u8 GetCollisionAtCoords(struct EventObject *eventObject, s16 x, s16 y, u32 dir) +u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dir) { u8 direction = dir; - if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) + if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) return COLLISION_OUTSIDE_RANGE; - else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction)) + else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction)) return COLLISION_IMPASSABLE; - else if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)) + else if (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction)) return COLLISION_IMPASSABLE; - else if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) + else if (IsZCoordMismatchAt(objectEvent->currentElevation, x, y)) return COLLISION_ELEVATION_MISMATCH; - else if (DoesObjectCollideWithObjectAt(eventObject, x, y)) + else if (DoesObjectCollideWithObjectAt(objectEvent, x, y)) return COLLISION_EVENT_OBJECT; return COLLISION_NONE; } -u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction) +u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction) { u8 flags = 0; - if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) + if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) flags |= 1; - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction) || (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction))) + if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction) || (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction))) flags |= 2; - if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) + if (IsZCoordMismatchAt(objectEvent->currentElevation, x, y)) flags |= 4; - if (DoesObjectCollideWithObjectAt(eventObject, x, y)) + if (DoesObjectCollideWithObjectAt(objectEvent, x, y)) flags |= 8; return flags; } -static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *eventObject, s16 x, s16 y) +static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent *objectEvent, s16 x, s16 y) { s16 left; s16 right; s16 top; s16 bottom; - if (eventObject->range.as_nybbles.x != 0) + if (objectEvent->range.as_nybbles.x != 0) { - left = eventObject->initialCoords.x - eventObject->range.as_nybbles.x; - right = eventObject->initialCoords.x + eventObject->range.as_nybbles.x; + left = objectEvent->initialCoords.x - objectEvent->range.as_nybbles.x; + right = objectEvent->initialCoords.x + objectEvent->range.as_nybbles.x; if (left > x || right < x) { return TRUE; } } - if (eventObject->range.as_nybbles.y != 0) + if (objectEvent->range.as_nybbles.y != 0) { - top = eventObject->initialCoords.y - eventObject->range.as_nybbles.y; - bottom = eventObject->initialCoords.y + eventObject->range.as_nybbles.y; + top = objectEvent->initialCoords.y - objectEvent->range.as_nybbles.y; + bottom = objectEvent->initialCoords.y + objectEvent->range.as_nybbles.y; if (top > y || bottom < y) { return TRUE; @@ -4924,9 +4924,9 @@ static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *eventObj return FALSE; } -static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, s16 x, s16 y, u8 direction) +static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction) { - if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior) + if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](objectEvent->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) { return TRUE; @@ -4934,19 +4934,19 @@ static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, return FALSE; } -static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 x, s16 y) +static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *objectEvent, s16 x, s16 y) { u8 i; - struct EventObject *curObject; + struct ObjectEvent *curObject; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - curObject = &gEventObjects[i]; - if (curObject->active && curObject != eventObject) + curObject = &gObjectEvents[i]; + if (curObject->active && curObject != objectEvent) { if ((curObject->currentCoords.x == x && curObject->currentCoords.y == y) || (curObject->previousCoords.x == x && curObject->previousCoords.y == y)) { - if (AreZCoordsCompatible(eventObject->currentElevation, curObject->currentElevation)) + if (AreZCoordsCompatible(objectEvent->currentElevation, curObject->currentElevation)) { return TRUE; } @@ -4958,10 +4958,10 @@ static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) - && gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 2) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) + && gSprites[gObjectEvents[objectEventId].spriteId].data[7] & 2) { return TRUE; } @@ -4971,11 +4971,11 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - gSprites[gEventObjects[eventObjectId].spriteId].data[7] |= 0x04; + gSprites[gObjectEvents[objectEventId].spriteId].data[7] |= 0x04; } } @@ -5041,7 +5041,7 @@ void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy) *y += dy; } -static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) +static void GetObjectEventMovingCameraOffset(s16 *x, s16 *y) { *x = 0; *y = 0; @@ -5063,106 +5063,106 @@ static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) } } -void EventObjectMoveDestCoords(struct EventObject *eventObject, u32 direction, s16 *x, s16 *y) +void ObjectEventMoveDestCoords(struct ObjectEvent *objectEvent, u32 direction, s16 *x, s16 *y) { u8 newDirn = direction; - *x = eventObject->currentCoords.x; - *y = eventObject->currentCoords.y; + *x = objectEvent->currentCoords.x; + *y = objectEvent->currentCoords.y; MoveCoords(newDirn, x, y); } -bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject) +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent) { - if (eventObject->singleMovementActive || eventObject->heldMovementActive) + if (objectEvent->singleMovementActive || objectEvent->heldMovementActive) return TRUE; return FALSE; } -bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject) +bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) + if (objectEvent->heldMovementActive && objectEvent->movementActionId != 0xFF) return TRUE; return FALSE; } -bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 movementActionId) +bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId) { - if (EventObjectIsMovementOverridden(eventObject)) + if (ObjectEventIsMovementOverridden(objectEvent)) return TRUE; - UnfreezeEventObject(eventObject); - eventObject->movementActionId = movementActionId; - eventObject->heldMovementActive = TRUE; - eventObject->heldMovementFinished = FALSE; - gSprites[eventObject->spriteId].data[2] = 0; + UnfreezeObjectEvent(objectEvent); + objectEvent->movementActionId = movementActionId; + objectEvent->heldMovementActive = TRUE; + objectEvent->heldMovementFinished = FALSE; + gSprites[objectEvent->spriteId].data[2] = 0; return FALSE; } -void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId) +void ObjectEventForceSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId) { - EventObjectClearHeldMovementIfActive(eventObject); - EventObjectSetHeldMovement(eventObject, movementActionId); + ObjectEventClearHeldMovementIfActive(objectEvent); + ObjectEventSetHeldMovement(objectEvent, movementActionId); } -void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject) +void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - EventObjectClearHeldMovement(eventObject); + if (objectEvent->heldMovementActive) + ObjectEventClearHeldMovement(objectEvent); } -void EventObjectClearHeldMovement(struct EventObject *eventObject) +void ObjectEventClearHeldMovement(struct ObjectEvent *objectEvent) { - eventObject->movementActionId = 0xFF; - eventObject->heldMovementActive = FALSE; - eventObject->heldMovementFinished = FALSE; - gSprites[eventObject->spriteId].data[1] = 0; - gSprites[eventObject->spriteId].data[2] = 0; + objectEvent->movementActionId = 0xFF; + objectEvent->heldMovementActive = FALSE; + objectEvent->heldMovementFinished = FALSE; + gSprites[objectEvent->spriteId].data[1] = 0; + gSprites[objectEvent->spriteId].data[2] = 0; } -u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject) +u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - return eventObject->heldMovementFinished; + if (objectEvent->heldMovementActive) + return objectEvent->heldMovementFinished; return 16; } -u8 EventObjectClearHeldMovementIfFinished(struct EventObject *eventObject) +u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *objectEvent) { - u8 heldMovementStatus = EventObjectCheckHeldMovementStatus(eventObject); + u8 heldMovementStatus = ObjectEventCheckHeldMovementStatus(objectEvent); if (heldMovementStatus != 0 && heldMovementStatus != 16) - EventObjectClearHeldMovementIfActive(eventObject); + ObjectEventClearHeldMovementIfActive(objectEvent); return heldMovementStatus; } -u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject) +u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - return eventObject->movementActionId; + if (objectEvent->heldMovementActive) + return objectEvent->movementActionId; return 0xFF; } -void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *)) +void UpdateObjectEventCurrentMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 (*callback)(struct ObjectEvent *, struct Sprite *)) { - DoGroundEffects_OnSpawn(eventObject, sprite); - TryEnableEventObjectAnim(eventObject, sprite); - if (EventObjectIsHeldMovementActive(eventObject)) + DoGroundEffects_OnSpawn(objectEvent, sprite); + TryEnableObjectEventAnim(objectEvent, sprite); + if (ObjectEventIsHeldMovementActive(objectEvent)) { - EventObjectExecHeldMovementAction(eventObject, sprite); + ObjectEventExecHeldMovementAction(objectEvent, sprite); } - else if (!eventObject->frozen) + else if (!objectEvent->frozen) { - while (callback(eventObject, sprite)); + while (callback(objectEvent, sprite)); } - DoGroundEffects_OnBeginStep(eventObject, sprite); - DoGroundEffects_OnFinishStep(eventObject, sprite); - UpdateEventObjectSpriteAnimPause(eventObject, sprite); - UpdateEventObjectVisibility(eventObject, sprite); - EventObjectUpdateSubpriority(eventObject, sprite); + DoGroundEffects_OnBeginStep(objectEvent, sprite); + DoGroundEffects_OnFinishStep(objectEvent, sprite); + UpdateObjectEventSpriteAnimPause(objectEvent, sprite); + UpdateObjectEventVisibility(objectEvent, sprite); + ObjectEventUpdateSubpriority(objectEvent, sprite); } #define dirn_to_anim(name, table)\ @@ -5194,9 +5194,9 @@ dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActio dirn_to_anim(GetWalkInPlaceFastMovementAction, gWalkInPlaceFastMovementActions); dirn_to_anim(GetWalkInPlaceFastestMovementAction, gWalkInPlaceFastestMovementActions); -bool8 EventObjectFaceOppositeDirection(struct EventObject *eventObject, u8 direction) +bool8 ObjectEventFaceOppositeDirection(struct ObjectEvent *objectEvent, u8 direction) { - return EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); + return ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); } dirn_to_anim(GetAcroWheelieFaceDirectionMovementAction, gAcroWheelieFaceDirectionMovementActions); @@ -5243,154 +5243,154 @@ static u32 state_to_direction(u8 a0, u32 a1, u32 a2) return gUnknown_0850DC3F[a0 - 1][zffuOffset - 1]; } -static void EventObjectExecHeldMovementAction(struct EventObject *eventObject, struct Sprite *sprite) +static void ObjectEventExecHeldMovementAction(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) + if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { - eventObject->heldMovementFinished = TRUE; + objectEvent->heldMovementFinished = TRUE; } } -static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) + if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { - eventObject->movementActionId = 0xFF; + objectEvent->movementActionId = 0xFF; sprite->data[2] = 0; return TRUE; } return FALSE; } -static void EventObjectSetSingleMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 animId) +static void ObjectEventSetSingleMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animId) { - eventObject->movementActionId = animId; + objectEvent->movementActionId = animId; sprite->data[2] = 0; } -static void FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +static void FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - SetEventObjectDirection(eventObject, direction); - ShiftStillEventObjectCoords(eventObject); - obj_npc_animation_step(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + SetObjectEventDirection(objectEvent, direction); + ShiftStillObjectEventCoords(objectEvent); + obj_npc_animation_step(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 MovementAction_FaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_SOUTH); + FaceDirection(objectEvent, sprite, DIR_SOUTH); return TRUE; } -bool8 MovementAction_FaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_NORTH); + FaceDirection(objectEvent, sprite, DIR_NORTH); return TRUE; } -bool8 MovementAction_FaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_WEST); + FaceDirection(objectEvent, sprite, DIR_WEST); return TRUE; } -bool8 MovementAction_FaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_EAST); + FaceDirection(objectEvent, sprite, DIR_EAST); return TRUE; } -void npc_apply_direction(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void npc_apply_direction(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; - SetEventObjectDirection(eventObject, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; + SetObjectEventDirection(objectEvent, direction); MoveCoords(direction, &x, &y); - ShiftEventObjectCoords(eventObject, x, y); + ShiftObjectEventCoords(objectEvent, x, y); oamt_npc_ministep_reset(sprite, direction, speed); sprite->animPaused = FALSE; - if (gLockedAnimEventObjects != NULL && FindLockedEventObjectIndex(eventObject) != EVENT_OBJECTS_COUNT) + if (gLockedAnimObjectEvents != NULL && FindLockedObjectEventIndex(objectEvent) != EVENT_OBJECTS_COUNT) { sprite->animPaused = TRUE; } - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } -void do_go_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void do_go_anim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { u8 (*functions[ARRAY_COUNT(gUnknown_0850DEE8)])(u8); memcpy(functions, gUnknown_0850DEE8, sizeof gUnknown_0850DEE8); - npc_apply_direction(eventObject, sprite, direction, speed); - npc_apply_anim_looping(eventObject, sprite, functions[speed](eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + npc_apply_anim_looping(objectEvent, sprite, functions[speed](objectEvent->facingDirection)); } -void StartRunningAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void StartRunningAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - npc_apply_direction(eventObject, sprite, direction, 1); - npc_apply_anim_looping(eventObject, sprite, GetRunningDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, 1); + npc_apply_anim_looping(objectEvent, sprite, GetRunningDirectionAnimNum(objectEvent->facingDirection)); } -bool8 npc_obj_ministep_stop_on_arrival(struct EventObject *eventObject, struct Sprite *sprite) +bool8 npc_obj_ministep_stop_on_arrival(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (obj_npc_ministep(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -void sub_8093AF0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8093AF0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; - SetEventObjectDirection(eventObject, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; + SetObjectEventDirection(objectEvent, direction); MoveCoords(direction, &x, &y); - ShiftEventObjectCoords(eventObject, x, y); + ShiftObjectEventCoords(objectEvent, x, y); sub_80976DC(sprite, direction); sprite->animPaused = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } -void sub_8093B60(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8093B60(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - sub_8093AF0(eventObject, sprite, direction); - npc_apply_anim_looping(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + sub_8093AF0(objectEvent, sprite, direction); + npc_apply_anim_looping(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); } -bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 an_walk_any_2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sub_80976EC(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -bool8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_NORTHWEST); - return MovementAction_WalkSlowDiagonalUpLeft_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_NORTHWEST); + return MovementAction_WalkSlowDiagonalUpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5398,15 +5398,15 @@ bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_NORTHEAST); - return MovementAction_WalkSlowDiagonalUpRight_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_NORTHEAST); + return MovementAction_WalkSlowDiagonalUpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5414,15 +5414,15 @@ bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *eventObje return FALSE; } -bool8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTHWEST); - return MovementAction_WalkSlowDiagonalDownLeft_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_SOUTHWEST); + return MovementAction_WalkSlowDiagonalDownLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5430,15 +5430,15 @@ bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *eventObj return FALSE; } -bool8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTHEAST); - return MovementAction_WalkSlowDiagonalDownRight_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_SOUTHEAST); + return MovementAction_WalkSlowDiagonalDownRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5446,15 +5446,15 @@ bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *eventOb return FALSE; } -bool8 MovementAction_WalkSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTH); - return MovementAction_WalkSlowDown_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_SOUTH); + return MovementAction_WalkSlowDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5462,15 +5462,15 @@ bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_NORTH); - return MovementAction_WalkSlowUp_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_NORTH); + return MovementAction_WalkSlowUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5478,15 +5478,15 @@ bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_WalkSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_WEST); - return MovementAction_WalkSlowLeft_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_WEST); + return MovementAction_WalkSlowLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5494,15 +5494,15 @@ bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_EAST); - return MovementAction_WalkSlowRight_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_EAST); + return MovementAction_WalkSlowRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5510,15 +5510,15 @@ bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTHWEST, 0); - return MovementAction_WalkNormalDiagonalUpLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTHWEST, 0); + return MovementAction_WalkNormalDiagonalUpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5526,15 +5526,15 @@ bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *eventObj return FALSE; } -bool8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTHEAST, 0); - return MovementAction_WalkNormalDiagonalUpRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTHEAST, 0); + return MovementAction_WalkNormalDiagonalUpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5542,15 +5542,15 @@ bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *eventOb return FALSE; } -bool8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTHWEST, 0); - return MovementAction_WalkNormalDiagonalDownLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTHWEST, 0); + return MovementAction_WalkNormalDiagonalDownLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5558,15 +5558,15 @@ bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *eventO return FALSE; } -bool8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTHEAST, 0); - return MovementAction_WalkNormalDiagonalDownRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTHEAST, 0); + return MovementAction_WalkNormalDiagonalDownRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5574,15 +5574,15 @@ bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *event return FALSE; } -bool8 MovementAction_WalkNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 0); - return MovementAction_WalkNormalDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 0); + return MovementAction_WalkNormalDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5590,15 +5590,15 @@ bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 0); - return MovementAction_WalkNormalUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 0); + return MovementAction_WalkNormalUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5606,15 +5606,15 @@ bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 0); - return MovementAction_WalkNormalLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 0); + return MovementAction_WalkNormalLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5622,15 +5622,15 @@ bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 0); - return MovementAction_WalkNormalRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 0); + return MovementAction_WalkNormalRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5638,7 +5638,7 @@ bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, stru return FALSE; } -void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) +void sub_8093FC4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) { s16 displacements[ARRAY_COUNT(gUnknown_0850DFBC)]; s16 x; @@ -5647,24 +5647,24 @@ void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 dire memcpy(displacements, gUnknown_0850DFBC, sizeof gUnknown_0850DFBC); x = 0; y = 0; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); MoveCoordsInDirection(direction, &x, &y, displacements[speed], displacements[speed]); - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); sub_809783C(sprite, direction, speed, a5); sprite->data[2] = 1; sprite->animPaused = 0; - eventObject->triggerGroundEffectsOnMove = 1; - eventObject->disableCoveringGroundEffects = 1; + objectEvent->triggerGroundEffectsOnMove = 1; + objectEvent->disableCoveringGroundEffects = 1; } -void maybe_shadow_1(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +void maybe_shadow_1(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { - sub_8093FC4(eventObject, sprite, direction, speed, a4); - npc_apply_anim_looping(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); - DoShadowFieldEffect(eventObject); + sub_8093FC4(objectEvent, sprite, direction, speed, a4); + npc_apply_anim_looping(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); + DoShadowFieldEffect(objectEvent); } -u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callback(struct Sprite *)) +u8 sub_80940C4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 callback(struct Sprite *)) { s16 displacements[ARRAY_COUNT(gUnknown_0850DFC2)]; s16 x; @@ -5677,125 +5677,125 @@ u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callba { x = 0; y = 0; - MoveCoordsInDirection(eventObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->disableCoveringGroundEffects = TRUE; + MoveCoordsInDirection(objectEvent->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->disableCoveringGroundEffects = TRUE; } else if (result == 0xFF) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; - eventObject->landingJump = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; + objectEvent->landingJump = TRUE; sprite->animPaused = TRUE; } return result; } -u8 sub_8094188(struct EventObject *eventObject, struct Sprite *sprite) +u8 sub_8094188(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return sub_80940C4(eventObject, sprite, sub_809785C); + return sub_80940C4(objectEvent, sprite, sub_809785C); } -u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite) +u8 sub_809419C(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return sub_80940C4(eventObject, sprite, sub_80978E4); + return sub_80940C4(objectEvent, sprite, sub_80978E4); } -bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80941B0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8094188(eventObject, sprite) == 0xFF) + if (sub_8094188(objectEvent, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80941C8(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_809419C(eventObject, sprite) == 0xFF) + if (sub_809419C(objectEvent, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_80941E0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80941E0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - switch (sub_8094188(eventObject, sprite)) + switch (sub_8094188(objectEvent, sprite)) { case 255: return TRUE; case 1: - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - obj_npc_animation_step(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); + obj_npc_animation_step(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); default: return FALSE; } } -bool8 MovementAction_Jump2Down_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Down_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 2, 0); - return MovementAction_Jump2Down_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 2, 0); + return MovementAction_Jump2Down_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Down_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Down_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Up_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Up_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 2, 0); - return MovementAction_Jump2Up_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 2, 0); + return MovementAction_Jump2Up_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Up_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Up_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Left_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Left_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 2, 0); - return MovementAction_Jump2Left_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 2, 0); + return MovementAction_Jump2Left_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Left_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Left_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Right_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Right_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 2, 0); - return MovementAction_Jump2Right_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 2, 0); + return MovementAction_Jump2Right_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Right_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Right_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -5809,7 +5809,7 @@ void sub_8094390(struct Sprite *sprite, u16 duration) sprite->data[3] = duration; } -bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (-- sprite->data[3] == 0) { @@ -5819,45 +5819,45 @@ bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite return FALSE; } -bool8 MovementAction_Delay1_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay1_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 1); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay2_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay2_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 2); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay4_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay4_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 4); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay8_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay8_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 8); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay16_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay16_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 16); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_WalkFastDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_WalkFastDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5865,15 +5865,15 @@ bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_WalkFastUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_WalkFastUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5881,15 +5881,15 @@ bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_WalkFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 1); - return MovementAction_WalkFastLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_WalkFastLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5897,15 +5897,15 @@ bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 1); - return MovementAction_WalkFastRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_WalkFastRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5914,16 +5914,16 @@ bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct } -void sub_8094554(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) +void sub_8094554(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) { - SetEventObjectDirection(eventObject, direction); - npc_apply_anim_looping(eventObject, sprite, animNum); + SetObjectEventDirection(objectEvent, direction); + npc_apply_anim_looping(objectEvent, sprite, animNum); sprite->animPaused = FALSE; sprite->data[2] = 1; sprite->data[3] = duration; } -bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (-- sprite->data[3] == 0) { @@ -5934,120 +5934,120 @@ bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlow_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sprite->data[3] & 1) { sprite->animDelayCounter++; } - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 2); - return MovementAction_RideWaterCurrentDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 2); + return MovementAction_RideWaterCurrentDown_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6055,15 +6055,15 @@ bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 2); - return MovementAction_RideWaterCurrentUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 2); + return MovementAction_RideWaterCurrentUp_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6071,15 +6071,15 @@ bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, s return FALSE; } -bool8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 2); - return MovementAction_RideWaterCurrentLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 2); + return MovementAction_RideWaterCurrentLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6087,15 +6087,15 @@ bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 2); - return MovementAction_RideWaterCurrentRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 2); + return MovementAction_RideWaterCurrentRight_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6103,15 +6103,15 @@ bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject return FALSE; } -bool8 MovementAction_WalkFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 3); - return MovementAction_WalkFastestDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 3); + return MovementAction_WalkFastestDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6119,15 +6119,15 @@ bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementAction_WalkFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 3); - return MovementAction_WalkFastestUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 3); + return MovementAction_WalkFastestUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6135,15 +6135,15 @@ bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 3); - return MovementAction_WalkFastestLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 3); + return MovementAction_WalkFastestLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6151,15 +6151,15 @@ bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementAction_WalkFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 3); - return MovementAction_WalkFastestRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 3); + return MovementAction_WalkFastestRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6167,15 +6167,15 @@ bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, str return FALSE; } -bool8 MovementAction_SlideDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 4); - return MovementAction_SlideDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 4); + return MovementAction_SlideDown_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6183,15 +6183,15 @@ bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Spr return FALSE; } -bool8 MovementAction_SlideUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 4); - return MovementAction_SlideUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 4); + return MovementAction_SlideUp_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6199,15 +6199,15 @@ bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -bool8 MovementAction_SlideLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 4); - return MovementAction_SlideLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 4); + return MovementAction_SlideLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6215,15 +6215,15 @@ bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Spr return FALSE; } -bool8 MovementAction_SlideRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 4); - return MovementAction_SlideRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 4); + return MovementAction_SlideRight_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6231,15 +6231,15 @@ bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_PlayerRunDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_SOUTH); - return MovementAction_PlayerRunDown_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_SOUTH); + return MovementAction_PlayerRunDown_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6247,15 +6247,15 @@ bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_PlayerRunUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_NORTH); - return MovementAction_PlayerRunUp_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_NORTH); + return MovementAction_PlayerRunUp_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6263,15 +6263,15 @@ bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementAction_PlayerRunLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_WEST); - return MovementAction_PlayerRunLeft_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_WEST); + return MovementAction_PlayerRunLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6279,15 +6279,15 @@ bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_PlayerRunRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_EAST); - return MovementAction_PlayerRunRight_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_EAST); + return MovementAction_PlayerRunRight_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6295,20 +6295,20 @@ bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struc return FALSE; } -void StartSpriteAnimInDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum) +void StartSpriteAnimInDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum) { SetAndStartSpriteAnim(sprite, animNum, 0); - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[2] = 1; } -bool8 MovementAction_StartAnimInDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_StartAnimInDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, eventObject->movementDirection, sprite->animNum); + StartSpriteAnimInDirection(objectEvent, sprite, objectEvent->movementDirection, sprite->animNum); return FALSE; } -bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WaitSpriteAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -6318,420 +6318,420 @@ bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Spri return FALSE; } -void sub_8094DE4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8094DE4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - sub_8093FC4(eventObject, sprite, direction, 1, 0); + sub_8093FC4(objectEvent, sprite, direction, 1, 0); StartSpriteAnim(sprite, GetJumpSpecialDirectionAnimNum(direction)); } -bool8 MovementAction_JumpSpecialDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_SOUTH); - return MovementAction_JumpSpecialDown_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_SOUTH); + return MovementAction_JumpSpecialDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_NORTH); - return MovementAction_JumpSpecialUp_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_NORTH); + return MovementAction_JumpSpecialUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_WEST); - return MovementAction_JumpSpecialLeft_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_WEST); + return MovementAction_JumpSpecialLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_EAST); - return MovementAction_JumpSpecialRight_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_EAST); + return MovementAction_JumpSpecialRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_FacePlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FacePlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 playerObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) { - FaceDirection(eventObject, sprite, GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y)); + FaceDirection(objectEvent, sprite, GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y)); } sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 playerObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) { - FaceDirection(eventObject, sprite, GetOppositeDirection(GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y))); + FaceDirection(objectEvent, sprite, GetOppositeDirection(GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y))); } sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_LockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_LockFacingDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->facingDirectionLocked = TRUE; + objectEvent->facingDirectionLocked = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->facingDirectionLocked = FALSE; + objectEvent->facingDirectionLocked = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_JumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 1, 2); - return MovementAction_JumpDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 1, 2); + return MovementAction_JumpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 1, 2); - return MovementAction_JumpUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 1, 2); + return MovementAction_JumpUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 1, 2); - return MovementAction_JumpLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 1, 2); + return MovementAction_JumpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 1, 2); - return MovementAction_JumpRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 1, 2); + return MovementAction_JumpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 0); - return MovementAction_JumpInPlaceDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 0, 0); + return MovementAction_JumpInPlaceDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 0); - return MovementAction_JumpInPlaceUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 0, 0); + return MovementAction_JumpInPlaceUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 0); - return MovementAction_JumpInPlaceLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 0, 0); + return MovementAction_JumpInPlaceLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 0); - return MovementAction_JumpInPlaceRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 0, 0); + return MovementAction_JumpInPlaceRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDownUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 2); - return MovementAction_JumpInPlaceDownUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 0, 2); + return MovementAction_JumpInPlaceDownUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 2); - return MovementAction_JumpInPlaceUpDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 0, 2); + return MovementAction_JumpInPlaceUpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 2); - return MovementAction_JumpInPlaceLeftRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 0, 2); + return MovementAction_JumpInPlaceLeftRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 2); - return MovementAction_JumpInPlaceRightLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 0, 2); + return MovementAction_JumpInPlaceRightLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]); + FaceDirection(objectEvent, sprite, gInitialMovementTypeFacingDirections[objectEvent->movementType]); return TRUE; } -bool8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, 0x14); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, 0x14); return FALSE; } -bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = FALSE; + objectEvent->disableJumpLandingGroundEffect = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = TRUE; + objectEvent->disableJumpLandingGroundEffect = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DisableAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DisableAnimation_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->inanimate = TRUE; + objectEvent->inanimate = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_RestoreAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RestoreAnimation_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; + objectEvent->inanimate = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->inanimate; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_SetInvisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetInvisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_SetVisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetVisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteExclamationMark_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_QUESTION_MARK_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteHeart_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_HEART_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_RevealTrainer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->movementType == MOVEMENT_TYPE_HIDDEN) + if (objectEvent->movementType == MOVEMENT_TYPE_HIDDEN) { - sub_80B4578(eventObject); + sub_80B4578(objectEvent); return FALSE; } - if (eventObject->movementType != MOVEMENT_TYPE_TREE_DISGUISE && eventObject->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) + if (objectEvent->movementType != MOVEMENT_TYPE_TREE_DISGUISE && objectEvent->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) { sprite->data[2] = 2; return TRUE; } - sub_8155D78(eventObject); + sub_8155D78(objectEvent); sprite->data[2] = 1; - return MovementAction_RevealTrainer_Step1(eventObject, sprite); + return MovementAction_RevealTrainer_Step1(objectEvent, sprite); } -bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8155DA0(eventObject)) + if (sub_8155DA0(objectEvent)) { sprite->data[2] = 2; return TRUE; @@ -6739,14 +6739,14 @@ bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_RockSmashBreak_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetAndStartSpriteAnim(sprite, 1, 0); sprite->data[2] = 1; return FALSE; } -bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -6756,25 +6756,25 @@ bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_RockSmashBreak_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible ^= TRUE; + objectEvent->invisible ^= TRUE; if (WaitForMovementDelay(sprite)) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->data[2] = 3; } return FALSE; } -bool8 MovementAction_CutTree_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetAndStartSpriteAnim(sprite, 1, 0); sprite->data[2] = 1; return FALSE; } -bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -6784,32 +6784,32 @@ bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -bool8 MovementAction_CutTree_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible ^= TRUE; + objectEvent->invisible ^= TRUE; if (WaitForMovementDelay(sprite)) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->data[2] = 3; } return FALSE; } -bool8 MovementAction_SetFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetFixedPriority_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->fixedPriority = TRUE; + objectEvent->fixedPriority = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_ClearFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ClearFixedPriority_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->fixedPriority = FALSE; + objectEvent->fixedPriority = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_InitAffineAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; InitSpriteAffineAnim(sprite); @@ -6818,7 +6818,7 @@ bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struc return TRUE; } -bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ClearAffineAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { FreeOamMatrix(sprite->oam.matrixNum); sprite->oam.affineMode = ST_OAM_AFFINE_OFF; @@ -6826,29 +6826,29 @@ bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, stru return TRUE; } -bool8 MovementAction_HideReflection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_HideReflection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->hideReflection = TRUE; + objectEvent->hideReflection = TRUE; return TRUE; } -bool8 MovementAction_ShowReflection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ShowReflection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->hideReflection = FALSE; + objectEvent->hideReflection = FALSE; return TRUE; } -bool8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownStartAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTH); + sub_8093B60(objectEvent, sprite, DIR_SOUTH); sprite->affineAnimPaused = FALSE; StartSpriteAffineAnimIfDifferent(sprite, 0); - return MovementAction_WalkDownStartAffine_Step1(eventObject, sprite); + return MovementAction_WalkDownStartAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6857,17 +6857,17 @@ bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_WalkDownAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTH); + sub_8093B60(objectEvent, sprite, DIR_SOUTH); sprite->affineAnimPaused = FALSE; ChangeSpriteAffineAnimIfDifferent(sprite, 1); - return MovementAction_WalkDownAffine_Step1(eventObject, sprite); + return MovementAction_WalkDownAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6876,17 +6876,17 @@ bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkLeftAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkLeftAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 1); + do_go_anim(objectEvent, sprite, DIR_WEST, 1); sprite->affineAnimPaused = FALSE; ChangeSpriteAffineAnimIfDifferent(sprite, 2); - return MovementAction_WalkLeftAffine_Step1(eventObject, sprite); + return MovementAction_WalkLeftAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkLeftAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkLeftAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6895,17 +6895,17 @@ bool8 MovementAction_WalkLeftAffine_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkRightAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkRightAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 1); + do_go_anim(objectEvent, sprite, DIR_EAST, 1); sprite->affineAnimPaused = FALSE; ChangeSpriteAffineAnimIfDifferent(sprite, 3); - return MovementAction_WalkRightAffine_Step1(eventObject, sprite); + return MovementAction_WalkRightAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkRightAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkRightAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6914,139 +6914,139 @@ bool8 MovementAction_WalkRightAffine_Step1(struct EventObject *eventObject, stru return FALSE; } -static void sub_80958C0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +static void sub_80958C0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - SetEventObjectDirection(eventObject, direction); - ShiftStillEventObjectCoords(eventObject); - obj_npc_animation_step(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); + SetObjectEventDirection(objectEvent, direction); + ShiftStillObjectEventCoords(objectEvent); + obj_npc_animation_step(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_SOUTH); + sub_80958C0(objectEvent, sprite, DIR_SOUTH); return TRUE; } -bool8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_NORTH); + sub_80958C0(objectEvent, sprite, DIR_NORTH); return TRUE; } -bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_WEST); + sub_80958C0(objectEvent, sprite, DIR_WEST); return TRUE; } -bool8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_EAST); + sub_80958C0(objectEvent, sprite, DIR_EAST); return TRUE; } -bool8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST)); return FALSE; } -bool8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST)); return FALSE; } -void sub_8095AF0(struct EventObject *eventObject, struct Sprite *sprite) +void sub_8095AF0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8097750(sprite); sprite->animPaused = FALSE; } -bool8 sub_8095B0C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8095B0C(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sub_8097758(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -bool8 MovementAction_Figure8_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Figure8_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095AF0(eventObject, sprite); + sub_8095AF0(objectEvent, sprite); sprite->data[2] = 1; - return MovementAction_Figure8_Step1(eventObject, sprite); + return MovementAction_Figure8_Step1(objectEvent, sprite); } -bool8 MovementAction_Figure8_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Figure8_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8095B0C(eventObject, sprite)) + if (sub_8095B0C(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7054,257 +7054,257 @@ bool8 MovementAction_Figure8_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -void sub_8095B84(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +void sub_8095B84(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { - sub_8093FC4(eventObject, sprite, direction, speed, a4); + sub_8093FC4(objectEvent, sprite, direction, speed, a4); StartSpriteAnimIfDifferent(sprite, GetAcroWheelieDirectionAnimNum(direction)); - DoShadowFieldEffect(eventObject); + DoShadowFieldEffect(objectEvent); } -bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_SOUTH, 0, 1); - return MovementAction_AcroWheelieHopFaceDown_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_SOUTH, 0, 1); + return MovementAction_AcroWheelieHopFaceDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_NORTH, 0, 1); - return MovementAction_AcroWheelieHopFaceUp_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_NORTH, 0, 1); + return MovementAction_AcroWheelieHopFaceUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_WEST, 0, 1); - return MovementAction_AcroWheelieHopFaceLeft_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_WEST, 0, 1); + return MovementAction_AcroWheelieHopFaceLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_EAST, 0, 1); - return MovementAction_AcroWheelieHopFaceRight_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_EAST, 0, 1); + return MovementAction_AcroWheelieHopFaceRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_SOUTH, 1, 1); - return MovementAction_AcroWheelieHopDown_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_SOUTH, 1, 1); + return MovementAction_AcroWheelieHopDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_NORTH, 1, 1); - return MovementAction_AcroWheelieHopUp_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_NORTH, 1, 1); + return MovementAction_AcroWheelieHopUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_WEST, 1, 1); - return MovementAction_AcroWheelieHopLeft_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_WEST, 1, 1); + return MovementAction_AcroWheelieHopLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_EAST, 1, 1); - return MovementAction_AcroWheelieHopRight_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_EAST, 1, 1); + return MovementAction_AcroWheelieHopRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_SOUTH, 2, 0); - return MovementAction_AcroWheelieJumpDown_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_SOUTH, 2, 0); + return MovementAction_AcroWheelieJumpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_NORTH, 2, 0); - return MovementAction_AcroWheelieJumpUp_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_NORTH, 2, 0); + return MovementAction_AcroWheelieJumpUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_WEST, 2, 0); - return MovementAction_AcroWheelieJumpLeft_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_WEST, 2, 0); + return MovementAction_AcroWheelieJumpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_EAST, 2, 0); - return MovementAction_AcroWheelieJumpRight_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_EAST, 2, 0); + return MovementAction_AcroWheelieJumpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -void sub_80960C8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_80960C8(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(objectEvent->facingDirection)); SeekSpriteAnim(sprite, 0); } -bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroPopWheelieMoveDown_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroPopWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7312,15 +7312,15 @@ bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroPopWheelieMoveUp_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroPopWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7328,15 +7328,15 @@ bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroPopWheelieMoveLeft_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroPopWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7344,15 +7344,15 @@ bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroPopWheelieMoveRight_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroPopWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7360,21 +7360,21 @@ bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -void sub_8096200(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8096200(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - npc_apply_anim_looping(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + npc_apply_anim_looping(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(objectEvent->facingDirection)); } -bool8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroWheelieMoveDown_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7382,15 +7382,15 @@ bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroWheelieMoveUp_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7398,15 +7398,15 @@ bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, st return FALSE; } -bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroWheelieMoveLeft_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7414,15 +7414,15 @@ bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroWheelieMoveRight_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7430,22 +7430,22 @@ bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, return FALSE; } -void sub_8096330(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8096330(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(objectEvent->facingDirection)); SeekSpriteAnim(sprite, 0); } -bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroEndWheelieMoveDown_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroEndWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7453,15 +7453,15 @@ bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroEndWheelieMoveUp_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroEndWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7469,15 +7469,15 @@ bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroEndWheelieMoveLeft_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroEndWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7485,15 +7485,15 @@ bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroEndWheelieMoveRight_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroEndWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7501,75 +7501,75 @@ bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -bool8 MovementAction_Levitate_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Levitate_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - CreateLevitateMovementTask(eventObject); + CreateLevitateMovementTask(objectEvent); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_StopLevitate_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_StopLevitate_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - DestroyExtraMovementTask(eventObject->warpArrowSpriteId); + DestroyExtraMovementTask(objectEvent->warpArrowSpriteId); sprite->pos2.y = 0; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sprite->pos2.y == 0) { - DestroyExtraMovementTask(eventObject->warpArrowSpriteId); + DestroyExtraMovementTask(objectEvent->warpArrowSpriteId); sprite->data[2] = 1; return TRUE; } return FALSE; } -u8 MovementAction_Finish(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_Finish(struct ObjectEvent *objectEvent, struct Sprite *sprite) { return TRUE; } -bool8 MovementAction_PauseSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PauseSpriteAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->animPaused = TRUE; return TRUE; } -static void UpdateEventObjectSpriteAnimPause(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjectEventSpriteAnimPause(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->disableAnim) + if (objectEvent->disableAnim) { sprite->animPaused = TRUE; } } -static void TryEnableEventObjectAnim(struct EventObject *eventObject, struct Sprite *sprite) +static void TryEnableObjectEventAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->enableAnim) + if (objectEvent->enableAnim) { sprite->animPaused = FALSE; - eventObject->disableAnim = FALSE; - eventObject->enableAnim = FALSE; + objectEvent->disableAnim = FALSE; + objectEvent->enableAnim = FALSE; } } -static void UpdateEventObjectVisibility(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjectEventVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096530(eventObject, sprite); - UpdateEventObjSpriteVisibility(eventObject, sprite); + sub_8096530(objectEvent, sprite); + UpdateEventObjSpriteVisibility(objectEvent, sprite); } -static void sub_8096530(struct EventObject *eventObject, struct Sprite *sprite) +static void sub_8096530(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u16 x, y; u16 x2, y2; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObject->offScreen = FALSE; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + objectEvent->offScreen = FALSE; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (sprite->coordOffsetEnabled) { x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; @@ -7586,221 +7586,221 @@ static void sub_8096530(struct EventObject *eventObject, struct Sprite *sprite) y2 += graphicsInfo->height; if ((s16)x >= 0x100 || (s16)x2 < -0x10) { - eventObject->offScreen = TRUE; + objectEvent->offScreen = TRUE; } if ((s16)y >= 0xB0 || (s16)y2 < -0x10) { - eventObject->offScreen = TRUE; + objectEvent->offScreen = TRUE; } } -static void UpdateEventObjSpriteVisibility(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateEventObjSpriteVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->invisible = FALSE; - if (eventObject->invisible || eventObject->offScreen) + if (objectEvent->invisible || objectEvent->offScreen) { sprite->invisible = TRUE; } } -static void GetAllGroundEffectFlags_OnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_Reflection(eventObj, flags); - GetGroundEffectFlags_TallGrassOnSpawn(eventObj, flags); - GetGroundEffectFlags_LongGrassOnSpawn(eventObj, flags); - GetGroundEffectFlags_SandHeap(eventObj, flags); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_Reflection(objEvent, flags); + GetGroundEffectFlags_TallGrassOnSpawn(objEvent, flags); + GetGroundEffectFlags_LongGrassOnSpawn(objEvent, flags); + GetGroundEffectFlags_SandHeap(objEvent, flags); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); } -static void GetAllGroundEffectFlags_OnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_Reflection(eventObj, flags); - GetGroundEffectFlags_TallGrassOnBeginStep(eventObj, flags); - GetGroundEffectFlags_LongGrassOnBeginStep(eventObj, flags); - GetGroundEffectFlags_Tracks(eventObj, flags); - GetGroundEffectFlags_SandHeap(eventObj, flags); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_Puddle(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_Reflection(objEvent, flags); + GetGroundEffectFlags_TallGrassOnBeginStep(objEvent, flags); + GetGroundEffectFlags_LongGrassOnBeginStep(objEvent, flags); + GetGroundEffectFlags_Tracks(objEvent, flags); + GetGroundEffectFlags_SandHeap(objEvent, flags); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_Puddle(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); } -static void GetAllGroundEffectFlags_OnFinishStep(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnFinishStep(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_SandHeap(eventObj, flags); - GetGroundEffectFlags_Puddle(eventObj, flags); - GetGroundEffectFlags_Ripple(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); - GetGroundEffectFlags_Seaweed(eventObj, flags); - GetGroundEffectFlags_JumpLanding(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_SandHeap(objEvent, flags); + GetGroundEffectFlags_Puddle(objEvent, flags); + GetGroundEffectFlags_Ripple(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); + GetGroundEffectFlags_Seaweed(objEvent, flags); + GetGroundEffectFlags_JumpLanding(objEvent, flags); } -static void EventObjectUpdateMetatileBehaviors(struct EventObject *eventObj) +static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent *objEvent) { - eventObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->previousCoords.x, eventObj->previousCoords.y); - eventObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->currentCoords.x, eventObj->currentCoords.y); + objEvent->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(objEvent->previousCoords.x, objEvent->previousCoords.y); + objEvent->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(objEvent->currentCoords.x, objEvent->currentCoords.y); } -static void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Reflection(struct ObjectEvent *objEvent, u32 *flags) { u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION }; - u8 type = EventObjectCheckForReflectiveSurface(eventObj); + u8 type = ObjectEventCheckForReflectiveSurface(objEvent); if (type) { - if (!eventObj->hasReflection) + if (!objEvent->hasReflection) { - eventObj->hasReflection = 0; - eventObj->hasReflection = 1; + objEvent->hasReflection = 0; + objEvent->hasReflection = 1; *flags |= reflectionFlags[type - 1]; } } else { - eventObj->hasReflection = 0; + objEvent->hasReflection = 0; } } -static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; } -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; } -static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN; } -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE; } -static void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Tracks(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsDeepSand(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_DEEP_SAND; } - else if (MetatileBehavior_IsSandOrDeepSand(eventObj->previousMetatileBehavior) - || MetatileBehavior_IsFootprints(eventObj->previousMetatileBehavior)) + else if (MetatileBehavior_IsSandOrDeepSand(objEvent->previousMetatileBehavior) + || MetatileBehavior_IsFootprints(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_SAND; } } -static void GetGroundEffectFlags_SandHeap(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_SandHeap(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsDeepSand(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsDeepSand(objEvent->previousMetatileBehavior)) { - if (!eventObj->inSandPile) + if (!objEvent->inSandPile) { - eventObj->inSandPile = 0; - eventObj->inSandPile = 1; + objEvent->inSandPile = 0; + objEvent->inSandPile = 1; *flags |= GROUND_EFFECT_FLAG_SAND_PILE; } } else { - eventObj->inSandPile = 0; + objEvent->inSandPile = 0; } } -static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent *objEvent, u32 *flags) { - if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior)) - || (MetatileBehavior_IsPacifidlogLog(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsPacifidlogLog(eventObj->previousMetatileBehavior))) + if ((MetatileBehavior_IsShallowFlowingWater(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsShallowFlowingWater(objEvent->previousMetatileBehavior)) + || (MetatileBehavior_IsPacifidlogLog(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsPacifidlogLog(objEvent->previousMetatileBehavior))) { - if (!eventObj->inShallowFlowingWater) + if (!objEvent->inShallowFlowingWater) { - eventObj->inShallowFlowingWater = 0; - eventObj->inShallowFlowingWater = 1; + objEvent->inShallowFlowingWater = 0; + objEvent->inShallowFlowingWater = 1; *flags |= GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER; } } else { - eventObj->inShallowFlowingWater = 0; + objEvent->inShallowFlowingWater = 0; } } -static void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Puddle(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsPuddle(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsPuddle(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_PUDDLE; } } -static void GetGroundEffectFlags_Ripple(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Ripple(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_HasRipples(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_RIPPLES; } -static void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsShortGrass(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsShortGrass(objEvent->previousMetatileBehavior)) { - if (!eventObj->inShortGrass) + if (!objEvent->inShortGrass) { - eventObj->inShortGrass = 0; - eventObj->inShortGrass = 1; + objEvent->inShortGrass = 0; + objEvent->inShortGrass = 1; *flags |= GROUND_EFFECT_FLAG_SHORT_GRASS; } } else { - eventObj->inShortGrass = 0; + objEvent->inShortGrass = 0; } } -static void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsHotSprings(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsHotSprings(objEvent->previousMetatileBehavior)) { - if (!eventObj->inHotSprings) + if (!objEvent->inHotSprings) { - eventObj->inHotSprings = 0; - eventObj->inHotSprings = 1; + objEvent->inHotSprings = 0; + objEvent->inHotSprings = 1; *flags |= GROUND_EFFECT_FLAG_HOT_SPRINGS; } } else { - eventObj->inHotSprings = 0; + objEvent->inHotSprings = 0; } } -static void GetGroundEffectFlags_Seaweed(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsSeaweed(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_SEAWEED; } -static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *objEvent, u32 *flags) { typedef bool8 (*MetatileFunc)(u8); @@ -7822,13 +7822,13 @@ static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 * GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND, }; - if (eventObj->landingJump && !eventObj->disableJumpLandingGroundEffect) + if (objEvent->landingJump && !objEvent->disableJumpLandingGroundEffect) { u8 i; for (i = 0; i < ARRAY_COUNT(metatileFuncs); i++) { - if (metatileFuncs[i](eventObj->currentMetatileBehavior)) + if (metatileFuncs[i](objEvent->currentMetatileBehavior)) { *flags |= jumpLandingFlags[i]; return; @@ -7837,9 +7837,9 @@ static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 * } } -static u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj) +static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent *objEvent) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); // ceil div by tile width? s16 width = (info->width + 8) >> 4; @@ -7858,14 +7858,14 @@ static u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj) for (i = 0, one = 1; i < height; i++) { - RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x, eventObj->currentCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x, eventObj->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->currentCoords.x, objEvent->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x, objEvent->previousCoords.y + one + i) for (j = 1; j < width; j++) { - RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x + j, eventObj->currentCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x - j, eventObj->currentCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x + j, eventObj->previousCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x - j, eventObj->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->currentCoords.x + j, objEvent->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->currentCoords.x - j, objEvent->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x + j, objEvent->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x - j, objEvent->previousCoords.y + one + i) } } return 0; @@ -7909,20 +7909,20 @@ u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z) return 0; } -static void SetEventObjectSpriteOamTableForLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +static void SetObjectEventSpriteOamTableForLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - if (eventObj->disableCoveringGroundEffects) + if (objEvent->disableCoveringGroundEffects) return; - if (!MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) return; - if (!MetatileBehavior_IsLongGrass(eventObj->previousMetatileBehavior)) + if (!MetatileBehavior_IsLongGrass(objEvent->previousMetatileBehavior)) return; sprite->subspriteTableNum = 4; - if (ZCoordToPriority(eventObj->previousElevation) == 1) + if (ZCoordToPriority(objEvent->previousElevation) == 1) sprite->subspriteTableNum = 5; } @@ -7948,54 +7948,54 @@ static const u8 sUnknown_08376050[] = { 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 }; -// Each byte corresponds to a sprite priority for an event object. -// This is directly the inverse of gEventObjectPriorities_08376070. -static const u8 sEventObjectPriorities_08376060[] = { +// Each byte corresponds to a sprite priority for an object event. +// This is directly the inverse of gObjectEventPriorities_08376070. +static const u8 sObjectEventPriorities_08376060[] = { 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2 }; -// Each byte corresponds to a sprite priority for an event object. -// This is the inverse of gEventObjectPriorities_08376060. +// Each byte corresponds to a sprite priority for an object event. +// This is the inverse of gObjectEventPriorities_08376060. // 1 = Above player sprite // 2 = Below player sprite -static const u8 sEventObjectPriorities_08376070[] = { +static const u8 sObjectEventPriorities_08376070[] = { 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1, }; -void UpdateEventObjectZCoordAndPriority(struct EventObject *eventObj, struct Sprite *sprite) +void UpdateObjectEventZCoordAndPriority(struct ObjectEvent *objEvent, struct Sprite *sprite) { - if (eventObj->fixedPriority) + if (objEvent->fixedPriority) return; - EventObjectUpdateZCoord(eventObj); + ObjectEventUpdateZCoord(objEvent); - sprite->subspriteTableNum = sEventObjectPriorities_08376070[eventObj->previousElevation]; - sprite->oam.priority = sEventObjectPriorities_08376060[eventObj->previousElevation]; + sprite->subspriteTableNum = sObjectEventPriorities_08376070[objEvent->previousElevation]; + sprite->oam.priority = sObjectEventPriorities_08376060[objEvent->previousElevation]; } static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z) { - sprite->subspriteTableNum = sEventObjectPriorities_08376070[z]; - sprite->oam.priority = sEventObjectPriorities_08376060[z]; + sprite->subspriteTableNum = sObjectEventPriorities_08376070[z]; + sprite->oam.priority = sObjectEventPriorities_08376060[z]; } u8 ZCoordToPriority(u8 z) { - return sEventObjectPriorities_08376060[z]; + return sObjectEventPriorities_08376060[z]; } -void EventObjectUpdateZCoord(struct EventObject *eventObj) +void ObjectEventUpdateZCoord(struct ObjectEvent *objEvent) { - u8 z = MapGridGetZCoordAt(eventObj->currentCoords.x, eventObj->currentCoords.y); - u8 z2 = MapGridGetZCoordAt(eventObj->previousCoords.x, eventObj->previousCoords.y); + u8 z = MapGridGetZCoordAt(objEvent->currentCoords.x, objEvent->currentCoords.y); + u8 z2 = MapGridGetZCoordAt(objEvent->previousCoords.x, objEvent->previousCoords.y); if (z == 0xF || z2 == 0xF) return; - eventObj->currentElevation = z; + objEvent->currentElevation = z; if (z != 0 && z != 0xF) - eventObj->previousElevation = z; + objEvent->previousElevation = z; } void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) @@ -8008,12 +8008,12 @@ void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) sprite->subpriority = tmp3 + sUnknown_08376050[a] + b; } -static void EventObjectUpdateSubpriority(struct EventObject *eventObj, struct Sprite *sprite) +static void ObjectEventUpdateSubpriority(struct ObjectEvent *objEvent, struct Sprite *sprite) { - if (eventObj->fixedPriority) + if (objEvent->fixedPriority) return; - SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); + SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1); } bool8 AreZCoordsCompatible(u8 a, u8 b) @@ -8027,96 +8027,96 @@ bool8 AreZCoordsCompatible(u8 a, u8 b) return TRUE; } -void GroundEffect_SpawnOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SpawnOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 1; FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_StepOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 0; FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_SpawnOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SpawnOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 1; FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_StepOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = (eventObj->localId << 8) | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = (objEvent->localId << 8) | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 0; FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_WaterReflection(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_WaterReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - SetUpReflection(eventObj, sprite, 0); + SetUpReflection(objEvent, sprite, 0); } -void GroundEffect_IceReflection(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_IceReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - SetUpReflection(eventObj, sprite, 1); + SetUpReflection(objEvent, sprite, 1); } -void GroundEffect_FlowingWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_FlowingWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_FEET_IN_FLOWING_WATER, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_FEET_IN_FLOWING_WATER, objEvent); } -static void (*const sGroundEffectTracksFuncs[])(struct EventObject *eventObj, struct Sprite *sprite, u8 a) = { +static void (*const sGroundEffectTracksFuncs[])(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) = { DoTracksGroundEffect_None, DoTracksGroundEffect_Footprints, DoTracksGroundEffect_BikeTireTracks, }; -void GroundEffect_SandTracks(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandTracks(struct ObjectEvent *objEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); - sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 0); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); + sGroundEffectTracksFuncs[info->tracks](objEvent, sprite, 0); } -void GroundEffect_DeepSandTracks(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_DeepSandTracks(struct ObjectEvent *objEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); - sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 1); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); + sGroundEffectTracksFuncs[info->tracks](objEvent, sprite, 1); } -static void DoTracksGroundEffect_None(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_None(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { } -static void DoTracksGroundEffect_Footprints(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_Footprints(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { // First half-word is a Field Effect script id. (gFieldEffectScriptPointers) u16 sandFootprints_FieldEffectData[2] = { @@ -8124,15 +8124,15 @@ static void DoTracksGroundEffect_Footprints(struct EventObject *eventObj, struct FLDEFF_DEEP_SAND_FOOTPRINTS }; - gFieldEffectArguments[0] = eventObj->previousCoords.x; - gFieldEffectArguments[1] = eventObj->previousCoords.y; + gFieldEffectArguments[0] = objEvent->previousCoords.x; + gFieldEffectArguments[1] = objEvent->previousCoords.y; gFieldEffectArguments[2] = 149; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->facingDirection; + gFieldEffectArguments[4] = objEvent->facingDirection; FieldEffectStart(sandFootprints_FieldEffectData[a]); } -static void DoTracksGroundEffect_BikeTireTracks(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { // Specifies which bike track shape to show next. // For example, when the bike turns from up to right, it will show @@ -8147,108 +8147,108 @@ static void DoTracksGroundEffect_BikeTireTracks(struct EventObject *eventObj, st 6, 7, 3, 4, }; - if (eventObj->currentCoords.x != eventObj->previousCoords.x || eventObj->currentCoords.y != eventObj->previousCoords.y) + if (objEvent->currentCoords.x != objEvent->previousCoords.x || objEvent->currentCoords.y != objEvent->previousCoords.y) { - gFieldEffectArguments[0] = eventObj->previousCoords.x; - gFieldEffectArguments[1] = eventObj->previousCoords.y; + gFieldEffectArguments[0] = objEvent->previousCoords.x; + gFieldEffectArguments[1] = objEvent->previousCoords.y; gFieldEffectArguments[2] = 149; gFieldEffectArguments[3] = 2; gFieldEffectArguments[4] = - bikeTireTracks_Transitions[eventObj->previousMovementDirection][eventObj->facingDirection - 5]; + bikeTireTracks_Transitions[objEvent->previousMovementDirection][objEvent->facingDirection - 5]; FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS); } } -void GroundEffect_Ripple(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_Ripple(struct ObjectEvent *objEvent, struct Sprite *sprite) { - DoRippleFieldEffect(eventObj, sprite); + DoRippleFieldEffect(objEvent, sprite); } -void GroundEffect_StepOnPuddle(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnPuddle(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SPLASH, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SPLASH, objEvent); } -void GroundEffect_SandHeap(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandHeap(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SAND_PILE, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SAND_PILE, objEvent); } -void GroundEffect_JumpOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { u8 spriteId; - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_TALL_GRASS); spriteId = FindTallGrassFieldEffectSpriteId( - eventObj->localId, - eventObj->mapNum, - eventObj->mapGroup, - eventObj->currentCoords.x, - eventObj->currentCoords.y); + objEvent->localId, + objEvent->mapNum, + objEvent->mapGroup, + objEvent->currentCoords.x, + objEvent->currentCoords.y); if (spriteId == MAX_SPRITES) - GroundEffect_SpawnOnTallGrass(eventObj, sprite); + GroundEffect_SpawnOnTallGrass(objEvent, sprite); } -void GroundEffect_JumpOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_LONG_GRASS); } -void GroundEffect_JumpOnShallowWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnShallowWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH); } -void GroundEffect_JumpOnWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH); } -void GroundEffect_JumpLandingDust(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpLandingDust(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_DUST); } -void GroundEffect_ShortGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_ShortGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SHORT_GRASS, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SHORT_GRASS, objEvent); } -void GroundEffect_HotSprings(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_HotSprings(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_HOT_SPRINGS_WATER, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_HOT_SPRINGS_WATER, objEvent); } -void GroundEffect_Seaweed(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_Seaweed(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; FieldEffectStart(FLDEFF_BUBBLES); } -static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct Sprite *sprite) = { +static void (*const sGroundEffectFuncs[])(struct ObjectEvent *objEvent, struct Sprite *sprite) = { GroundEffect_SpawnOnTallGrass, GroundEffect_StepOnTallGrass, GroundEffect_SpawnOnLongGrass, @@ -8271,26 +8271,26 @@ static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct S GroundEffect_Seaweed }; -static void DoFlaggedGroundEffects(struct EventObject *eventObj, struct Sprite *sprite, u32 flags) +static void DoFlaggedGroundEffects(struct ObjectEvent *objEvent, struct Sprite *sprite, u32 flags) { u8 i; - if (EventObjectIsFarawayIslandMew(eventObj) == TRUE && !sub_81D4A58(eventObj)) + if (ObjectEventIsFarawayIslandMew(objEvent) == TRUE && !sub_81D4A58(objEvent)) return; for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1) if (flags & 1) - sGroundEffectFuncs[i](eventObj, sprite); + sGroundEffectFuncs[i](objEvent, sprite); } -void filters_out_some_ground_effects(struct EventObject *eventObj, u32 *flags) +void filters_out_some_ground_effects(struct ObjectEvent *objEvent, u32 *flags) { - if (eventObj->disableCoveringGroundEffects) + if (objEvent->disableCoveringGroundEffects) { - eventObj->inShortGrass = 0; - eventObj->inSandPile = 0; - eventObj->inShallowFlowingWater = 0; - eventObj->inHotSprings = 0; + objEvent->inShortGrass = 0; + objEvent->inSandPile = 0; + objEvent->inShallowFlowingWater = 0; + objEvent->inHotSprings = 0; *flags &= ~(GROUND_EFFECT_FLAG_HOT_SPRINGS | GROUND_EFFECT_FLAG_SHORT_GRASS | GROUND_EFFECT_FLAG_SAND_PILE @@ -8299,111 +8299,111 @@ void filters_out_some_ground_effects(struct EventObject *eventObj, u32 *flags) } } -void FilterOutStepOnPuddleGroundEffectIfJumping(struct EventObject *eventObj, u32 *flags) +void FilterOutStepOnPuddleGroundEffectIfJumping(struct ObjectEvent *objEvent, u32 *flags) { - if (eventObj->landingJump) + if (objEvent->landingJump) *flags &= ~GROUND_EFFECT_FLAG_PUDDLE; } -static void DoGroundEffects_OnSpawn(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnSpawn(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnMove) + if (objEvent->triggerGroundEffectsOnMove) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnSpawn(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - DoFlaggedGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnMove = 0; - eventObj->disableCoveringGroundEffects = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnSpawn(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + DoFlaggedGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnMove = 0; + objEvent->disableCoveringGroundEffects = 0; } } -static void DoGroundEffects_OnBeginStep(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnBeginStep(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnMove) + if (objEvent->triggerGroundEffectsOnMove) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnBeginStep(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - filters_out_some_ground_effects(eventObj, &flags); - DoFlaggedGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnMove = 0; - eventObj->disableCoveringGroundEffects = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnBeginStep(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + filters_out_some_ground_effects(objEvent, &flags); + DoFlaggedGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnMove = 0; + objEvent->disableCoveringGroundEffects = 0; } } -static void DoGroundEffects_OnFinishStep(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnFinishStep(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnStop) + if (objEvent->triggerGroundEffectsOnStop) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnFinishStep(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - FilterOutStepOnPuddleGroundEffectIfJumping(eventObj, &flags); - DoFlaggedGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnStop = 0; - eventObj->landingJump = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnFinishStep(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + FilterOutStepOnPuddleGroundEffectIfJumping(objEvent, &flags); + DoFlaggedGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnStop = 0; + objEvent->landingJump = 0; } } -bool8 FreezeEventObject(struct EventObject *eventObject) +bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive || eventObject->frozen) + if (objectEvent->heldMovementActive || objectEvent->frozen) { return TRUE; } else { - eventObject->frozen = 1; - eventObject->spriteAnimPausedBackup = gSprites[eventObject->spriteId].animPaused; - eventObject->spriteAffineAnimPausedBackup = gSprites[eventObject->spriteId].affineAnimPaused; - gSprites[eventObject->spriteId].animPaused = 1; - gSprites[eventObject->spriteId].affineAnimPaused = 1; + objectEvent->frozen = 1; + objectEvent->spriteAnimPausedBackup = gSprites[objectEvent->spriteId].animPaused; + objectEvent->spriteAffineAnimPausedBackup = gSprites[objectEvent->spriteId].affineAnimPaused; + gSprites[objectEvent->spriteId].animPaused = 1; + gSprites[objectEvent->spriteId].affineAnimPaused = 1; return FALSE; } } -void FreezeEventObjects(void) +void FreezeObjectEvents(void) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - if (gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) - FreezeEventObject(&gEventObjects[i]); + if (gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) + FreezeObjectEvent(&gObjectEvents[i]); } -void FreezeEventObjectsExceptOne(u8 eventObjectId) +void FreezeObjectEventsExceptOne(u8 objectEventId) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - if (i != eventObjectId && gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) - FreezeEventObject(&gEventObjects[i]); + if (i != objectEventId && gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) + FreezeObjectEvent(&gObjectEvents[i]); } -void UnfreezeEventObject(struct EventObject *eventObject) +void UnfreezeObjectEvent(struct ObjectEvent *objectEvent) { - if (eventObject->active && eventObject->frozen) + if (objectEvent->active && objectEvent->frozen) { - eventObject->frozen = 0; - gSprites[eventObject->spriteId].animPaused = eventObject->spriteAnimPausedBackup; - gSprites[eventObject->spriteId].affineAnimPaused = eventObject->spriteAffineAnimPausedBackup; + objectEvent->frozen = 0; + gSprites[objectEvent->spriteId].animPaused = objectEvent->spriteAnimPausedBackup; + gSprites[objectEvent->spriteId].affineAnimPaused = objectEvent->spriteAffineAnimPausedBackup; } } -void UnfreezeEventObjects(void) +void UnfreezeObjectEvents(void) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - if (gEventObjects[i].active) - UnfreezeEventObject(&gEventObjects[i]); + if (gObjectEvents[i].active) + UnfreezeObjectEvent(&gObjectEvents[i]); } static void Step1(struct Sprite *sprite, u8 dir) @@ -8758,7 +8758,7 @@ bool8 SpriteAnimEnded(struct Sprite *sprite) return FALSE; } -void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible) +void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible) { u16 x, y; s16 x2, y2; @@ -8785,11 +8785,11 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible) sprite->invisible = TRUE; } -static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite) +static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *sprite) { sub_8097D68(sprite); SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1); - UpdateEventObjectSpriteVisibility(sprite, sprite->data[2]); + UpdateObjectEventSpriteVisibility(sprite, sprite->data[2]); } void sub_8097AF0(void) @@ -8799,7 +8799,7 @@ void sub_8097AF0(void) for(i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility) + if(sprite->inUse && sprite->callback == UpdateObjectEventSpriteSubpriorityAndVisibility) DestroySprite(sprite); } } @@ -8811,7 +8811,7 @@ int sub_8097B2C(u8 var) // this should return a u8, because all that call this s for(i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == var) + if(sprite->inUse && sprite->callback == UpdateObjectEventSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == var) return i; } return MAX_SPRITES; @@ -8832,7 +8832,7 @@ void sub_8097BB4(u8 var1, u8 graphicsId) if(spriteId != MAX_SPRITES) { struct Sprite *sprite = &gSprites[spriteId]; - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); u16 tileNum = sprite->oam.tileNum; sprite->oam = *graphicsInfo->oam; @@ -8956,24 +8956,24 @@ bool32 sub_8097D9C(u8 var) return FALSE; } -u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject) +u32 StartFieldEffectForObjectEvent(u8 fieldEffectId, struct ObjectEvent *objectEvent) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); return FieldEffectStart(fieldEffectId); } -void DoShadowFieldEffect(struct EventObject *eventObject) +void DoShadowFieldEffect(struct ObjectEvent *objectEvent) { - if (!eventObject->hasShadow) + if (!objectEvent->hasShadow) { - eventObject->hasShadow = 1; - StartFieldEffectForEventObject(FLDEFF_SHADOW, eventObject); + objectEvent->hasShadow = 1; + StartFieldEffectForObjectEvent(FLDEFF_SHADOW, objectEvent); } } -static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite *sprite) +static void DoRippleFieldEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); gFieldEffectArguments[0] = sprite->pos1.x; gFieldEffectArguments[1] = sprite->pos1.y + (graphicsInfo->height >> 1) - 2; gFieldEffectArguments[2] = 151; @@ -8981,38 +8981,38 @@ static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite * FieldEffectStart(FLDEFF_RIPPLE); } -u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StoreAndLockAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FreeAndUnlockAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FlyUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FlyUp_Step0, MovementAction_FlyUp_Step1, MovementAction_Fly_Finish, }; -u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FlyDown_Step0, MovementAction_FlyDown_Step1, MovementAction_Fly_Finish, }; -u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u32 one; bool32 ableToStore = FALSE; - if (gLockedAnimEventObjects == NULL) + if (gLockedAnimObjectEvents == NULL) { - gLockedAnimEventObjects = AllocZeroed(sizeof(struct LockedAnimEventObjects)); - gLockedAnimEventObjects->eventObjectIds[0] = eventObject->localId; + gLockedAnimObjectEvents = AllocZeroed(sizeof(struct LockedAnimObjectEvents)); + gLockedAnimObjectEvents->objectEventIds[0] = objectEvent->localId; // needed to match - gLockedAnimEventObjects->count = (one = 1); + gLockedAnimObjectEvents->count = (one = 1); ableToStore = one; } else @@ -9022,10 +9022,10 @@ u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct bool32 found; for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++) { - if (firstFreeSlot == 16 && gLockedAnimEventObjects->eventObjectIds[i] == 0) + if (firstFreeSlot == 16 && gLockedAnimObjectEvents->objectEventIds[i] == 0) firstFreeSlot = i; - if (gLockedAnimEventObjects->eventObjectIds[i] == eventObject->localId) + if (gLockedAnimObjectEvents->objectEventIds[i] == objectEvent->localId) { found = TRUE; break; @@ -9034,44 +9034,44 @@ u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct if (!found && firstFreeSlot != 16) { - gLockedAnimEventObjects->eventObjectIds[firstFreeSlot] = eventObject->localId; - gLockedAnimEventObjects->count++; + gLockedAnimObjectEvents->objectEventIds[firstFreeSlot] = objectEvent->localId; + gLockedAnimObjectEvents->count++; ableToStore = TRUE; } } if (ableToStore == TRUE) { - eventObject->inanimate = TRUE; - eventObject->facingDirectionLocked = TRUE; + objectEvent->inanimate = TRUE; + objectEvent->facingDirectionLocked = TRUE; } sprite->data[2] = 1; return TRUE; } -u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { bool32 ableToStore; u8 index; sprite->data[2] = 1; - if (gLockedAnimEventObjects != NULL) + if (gLockedAnimObjectEvents != NULL) { ableToStore = FALSE; - index = FindLockedEventObjectIndex(eventObject); + index = FindLockedObjectEventIndex(objectEvent); if (index != 16) { - gLockedAnimEventObjects->eventObjectIds[index] = 0; - gLockedAnimEventObjects->count--; + gLockedAnimObjectEvents->objectEventIds[index] = 0; + gLockedAnimObjectEvents->count--; ableToStore = TRUE; } - if (gLockedAnimEventObjects->count == 0) - FREE_AND_SET_NULL(gLockedAnimEventObjects); + if (gLockedAnimObjectEvents->count == 0) + FREE_AND_SET_NULL(gLockedAnimObjectEvents); if (ableToStore == TRUE) { - eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; - eventObject->facingDirectionLocked = FALSE; + objectEvent->inanimate = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->inanimate; + objectEvent->facingDirectionLocked = FALSE; sprite->animPaused = 0; } } @@ -9079,36 +9079,36 @@ u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *eventObject, struc return TRUE; } -u8 FindLockedEventObjectIndex(struct EventObject *eventObject) +u8 FindLockedObjectEventIndex(struct ObjectEvent *objectEvent) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gLockedAnimEventObjects->eventObjectIds[i] == eventObject->localId) + if (gLockedAnimObjectEvents->objectEventIds[i] == objectEvent->localId) return i; } return EVENT_OBJECTS_COUNT; } -void CreateLevitateMovementTask(struct EventObject *eventObject) +void CreateLevitateMovementTask(struct ObjectEvent *objectEvent) { u8 taskId = CreateTask(ApplyLevitateMovement, 0xFF); struct Task *task = &gTasks[taskId]; - StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject); - eventObject->warpArrowSpriteId = taskId; + StoreWordInTwoHalfwords(&task->data[0], (u32)objectEvent); + objectEvent->warpArrowSpriteId = taskId; task->data[3] = 0xFFFF; } static void ApplyLevitateMovement(u8 taskId) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; struct Task *task = &gTasks[taskId]; - LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&eventObject); // load the map object pointer. - sprite = &gSprites[eventObject->spriteId]; + LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&objectEvent); // load the map object pointer. + sprite = &gSprites[objectEvent->spriteId]; if(!(task->data[2] & 0x3)) sprite->pos2.y += task->data[3]; @@ -9121,10 +9121,10 @@ static void ApplyLevitateMovement(u8 taskId) void DestroyExtraMovementTask(u8 taskId) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Task *task = &gTasks[taskId]; - LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&eventObject); // unused eventObject + LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&objectEvent); // unused objectEvent DestroyTask(taskId); } @@ -9135,19 +9135,19 @@ void sub_8098074(u8 var1, u8 var2) for(i = 0; i < EVENT_OBJECTS_COUNT; i++) { if(i != var1 && i != var2 && - gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) - FreezeEventObject(&gEventObjects[i]); + gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) + FreezeObjectEvent(&gObjectEvents[i]); } } -u8 MovementAction_FlyUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = 0; sprite->data[2]++; return FALSE; } -u8 MovementAction_FlyUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y -= 8; @@ -9156,14 +9156,14 @@ u8 MovementAction_FlyUp_Step1(struct EventObject *eventObject, struct Sprite *sp return FALSE; } -u8 MovementAction_FlyDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = -160; sprite->data[2]++; return FALSE; } -u8 MovementAction_FlyDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y += 8; @@ -9173,7 +9173,7 @@ u8 MovementAction_FlyDown_Step1(struct EventObject *eventObject, struct Sprite * } // though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it. -u8 MovementAction_Fly_Finish(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_Fly_Finish(struct ObjectEvent *objectEvent, struct Sprite *sprite) { return TRUE; } diff --git a/src/faraway_island.c b/src/faraway_island.c index 6a835a02b0..7e31d58f3d 100755 --- a/src/faraway_island.c +++ b/src/faraway_island.c @@ -12,10 +12,10 @@ #include "constants/vars.h" static u8 sub_81D4890(u8); -static bool8 sub_81D4C14(struct EventObject*, u8); -static u8 sub_81D4C9C(struct EventObject*, u8); -static u8 sub_81D4C58(struct EventObject*, u8); -static u8 sub_81D4CE0(struct EventObject*, u8); +static bool8 sub_81D4C14(struct ObjectEvent*, u8); +static u8 sub_81D4C9C(struct ObjectEvent*, u8); +static u8 sub_81D4C58(struct ObjectEvent*, u8); +static u8 sub_81D4CE0(struct ObjectEvent*, u8); static u8 sub_81D4D24(u8); static bool8 CanMewWalkToCoords(s16, s16); @@ -36,26 +36,26 @@ static const s16 sFarawayIslandRockCoords[4][2] = {20, 20}, }; -static u8 GetMewEventObjectId(void) +static u8 GetMewObjectEventId(void) { - u8 eventObjectId; - TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); - return eventObjectId; + u8 objectEventId; + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + return objectEventId; } u32 GetMewMoveDirection(void) { u8 i; int skip; - struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; + struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; - sPlayerToMewDeltaX = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x - mew->currentCoords.x; - sPlayerToMewDeltaY = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y - mew->currentCoords.y; + sPlayerToMewDeltaX = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x - mew->currentCoords.x; + sPlayerToMewDeltaY = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y - mew->currentCoords.y; for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++) sMewDirectionCandidates[i] = DIR_NONE; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x - && gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x + && gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y) { return DIR_NONE; } @@ -70,10 +70,10 @@ u32 GetMewMoveDirection(void) for (i = 0; i < ARRAY_COUNT(sFarawayIslandRockCoords); i++) { - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == sFarawayIslandRockCoords[i][0]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == sFarawayIslandRockCoords[i][0]) { skip = 0; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y < sFarawayIslandRockCoords[i][1]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y < sFarawayIslandRockCoords[i][1]) { if (mew->currentCoords.y <= sFarawayIslandRockCoords[i][1]) skip = 1; @@ -88,7 +88,7 @@ u32 GetMewMoveDirection(void) { if (sPlayerToMewDeltaX > 0) { - if (mew->currentCoords.x + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + if (mew->currentCoords.x + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) return DIR_EAST; @@ -96,14 +96,14 @@ u32 GetMewMoveDirection(void) } else if (sPlayerToMewDeltaX < 0) { - if (mew->currentCoords.x - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + if (mew->currentCoords.x - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) return DIR_WEST; } } - if (mew->currentCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + if (mew->currentCoords.x == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { if (sPlayerToMewDeltaY > 0) { @@ -119,10 +119,10 @@ u32 GetMewMoveDirection(void) } } - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == sFarawayIslandRockCoords[i][1]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == sFarawayIslandRockCoords[i][1]) { skip = 0; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x < sFarawayIslandRockCoords[i][0]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x < sFarawayIslandRockCoords[i][0]) { if (mew->currentCoords.x <= sFarawayIslandRockCoords[i][0]) skip = 1; @@ -137,7 +137,7 @@ u32 GetMewMoveDirection(void) { if (sPlayerToMewDeltaY > 0) { - if (mew->currentCoords.y + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + if (mew->currentCoords.y + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) return DIR_SOUTH; @@ -145,14 +145,14 @@ u32 GetMewMoveDirection(void) } else if (sPlayerToMewDeltaY < 0) { - if (mew->currentCoords.y - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + if (mew->currentCoords.y - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) return DIR_NORTH; } } - if (mew->currentCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + if (mew->currentCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { if (sPlayerToMewDeltaX > 0) { @@ -211,13 +211,13 @@ u32 GetMewMoveDirection(void) if (sPlayerToMewDeltaY == 0) { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y > mew->currentCoords.y) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y > mew->currentCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) return DIR_NORTH; } - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y < mew->currentCoords.y) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y < mew->currentCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) return DIR_SOUTH; @@ -232,13 +232,13 @@ u32 GetMewMoveDirection(void) if (sPlayerToMewDeltaX == 0) { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x > mew->currentCoords.x) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x > mew->currentCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) return DIR_WEST; } - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x < mew->currentCoords.x) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x < mew->currentCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) return DIR_EAST; @@ -256,8 +256,8 @@ u32 GetMewMoveDirection(void) static bool8 CanMewWalkToCoords(s16 x, s16 y) { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x == x - && gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y == y) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x == x + && gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y == y) { return FALSE; } @@ -269,7 +269,7 @@ static u8 sub_81D4890(u8 ignoredDir) { u8 i; u8 count = 0; - struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; + struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++) sMewDirectionCandidates[i] = DIR_NONE; @@ -318,12 +318,12 @@ void UpdateFarawayIslandStepCounter(void) } } -bool8 EventObjectIsFarawayIslandMew(struct EventObject *eventObject) +bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *objectEvent) { if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) { - if (eventObject->graphicsId == EVENT_OBJ_GFX_MEW) + if (objectEvent->graphicsId == EVENT_OBJ_GFX_MEW) return TRUE; } @@ -342,7 +342,7 @@ bool8 IsMewPlayingHideAndSeek(void) return FALSE; } -bool8 sub_81D4A58(struct EventObject *eventObject) +bool8 sub_81D4A58(struct ObjectEvent *objectEvent) { if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) != 0xFFFF && VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 4 == 0) @@ -356,7 +356,7 @@ void sub_81D4A90(void) s16 x; s16 y; u8 spriteId; - struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; + struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; mew->invisible = 0; if (gSpecialVar_0x8004 == 1) @@ -396,7 +396,7 @@ void sub_81D4BEC(void) DestroySprite(&gSprites[sUnknown_0203CF50]); } -static bool8 sub_81D4C14(struct EventObject *mew, u8 index) +static bool8 sub_81D4C14(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaY > 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) { @@ -407,7 +407,7 @@ static bool8 sub_81D4C14(struct EventObject *mew, u8 index) return FALSE; } -static u8 sub_81D4C58(struct EventObject *mew, u8 index) +static u8 sub_81D4C58(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaX < 0 && CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) { @@ -418,7 +418,7 @@ static u8 sub_81D4C58(struct EventObject *mew, u8 index) return FALSE; } -static u8 sub_81D4C9C(struct EventObject *mew, u8 index) +static u8 sub_81D4C9C(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaY < 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) { @@ -429,7 +429,7 @@ static u8 sub_81D4C9C(struct EventObject *mew, u8 index) return FALSE; } -static u8 sub_81D4CE0(struct EventObject *mew, u8 index) +static u8 sub_81D4CE0(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaX > 0 && CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) { diff --git a/src/field_camera.c b/src/field_camera.c index 7f294afdb7..c5b32ff3b2 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -299,7 +299,7 @@ static void DrawMetatile(s32 metatileLayerType, u16 *metatiles, u16 offset) gBGTilemapBuffers1[offset + 0x20] = metatiles[2]; gBGTilemapBuffers1[offset + 0x21] = metatiles[3]; - // Draw metatile's top layer to the top background layer, which covers event object sprites. + // Draw metatile's top layer to the top background layer, which covers object event sprites. gBGTilemapBuffers2[offset] = metatiles[4]; gBGTilemapBuffers2[offset + 1] = metatiles[5]; gBGTilemapBuffers2[offset + 0x20] = metatiles[6]; @@ -415,7 +415,7 @@ void CameraUpdate(void) if (deltaX != 0 || deltaY != 0) { CameraMove(deltaX, deltaY); - UpdateEventObjectsForCameraUpdate(deltaX, deltaY); + UpdateObjectEventsForCameraUpdate(deltaX, deltaY); RotatingGatePuzzleCameraUpdate(deltaX, deltaY); ResetBerryTreeSparkleFlags(); tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2); @@ -430,7 +430,7 @@ void CameraUpdate(void) void MoveCameraAndRedrawMap(int deltaX, int deltaY) //unused { CameraMove(deltaX, deltaY); - UpdateEventObjectsForCameraUpdate(deltaX, deltaY); + UpdateObjectEventsForCameraUpdate(deltaX, deltaY); DrawWholeMapView(); gTotalCameraPixelOffsetX -= deltaX * 16; gTotalCameraPixelOffsetY -= deltaY * 16; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 41b7a4dbf9..2326ec1014 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -38,14 +38,14 @@ static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; -u8 gSelectedEventObject; +u8 gSelectedObjectEvent; static void GetPlayerPosition(struct MapPosition *); static void GetInFrontOfPlayerPosition(struct MapPosition *); static u16 GetPlayerCurMetatileBehavior(int); static bool8 TryStartInteractionScript(struct MapPosition*, u16, u8); static const u8 *GetInteractionScript(struct MapPosition*, u8, u8); -static const u8 *GetInteractedEventObjectScript(struct MapPosition *, u8, u8); +static const u8 *GetInteractedObjectEventScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedBackgroundEventScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedMetatileScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedWaterScript(struct MapPosition *, u8, u8); @@ -138,7 +138,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) u16 metatileBehavior; gSpecialVar_LastTalked = 0; - gSelectedEventObject = 0; + gSelectedObjectEvent = 0; playerDirection = GetPlayerFacingDirection(); GetPlayerPosition(&position); @@ -239,7 +239,7 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - const u8 *script = GetInteractedEventObjectScript(position, metatileBehavior, direction); + const u8 *script = GetInteractedObjectEventScript(position, metatileBehavior, direction); if (script != NULL) return script; @@ -260,54 +260,54 @@ static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileB const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - u8 eventObjectId; + u8 objectEventId; s32 i; if (!MetatileBehavior_IsCounter(MapGridGetMetatileBehaviorAt(position->x, position->y))) - eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); + objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); else - eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); + objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) + if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) return NULL; for (i = 0; i < 4; i++) { - if (gLinkPlayerEventObjects[i].active == TRUE && gLinkPlayerEventObjects[i].eventObjId == eventObjectId) + if (gLinkPlayerObjectEvents[i].active == TRUE && gLinkPlayerObjectEvents[i].objEventId == objectEventId) return NULL; } - gSelectedEventObject = eventObjectId; - gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; + gSelectedObjectEvent = objectEventId; + gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId; gSpecialVar_Facing = direction; - return GetEventObjectScriptPointerByEventObjectId(eventObjectId); + return GetObjectEventScriptPointerByObjectEventId(objectEventId); } -static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) +static const u8 *GetInteractedObjectEventScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - u8 eventObjectId; + u8 objectEventId; const u8 *script; - eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); - if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) + objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); + if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; - // Look for an event object on the other side of the counter. - eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) + // Look for an object event on the other side of the counter. + objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); + if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) return NULL; } - gSelectedEventObject = eventObjectId; - gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; + gSelectedObjectEvent = objectEventId; + gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId; gSpecialVar_Facing = direction; if (InTrainerHill() == TRUE) script = GetTrainerHillTrainerScript(); else - script = GetEventObjectScriptPointerByEventObjectId(eventObjectId); + script = GetObjectEventScriptPointerByObjectEventId(objectEventId); script = GetRamScript(gSpecialVar_LastTalked, script); return script; @@ -982,14 +982,14 @@ u8 TrySetDiveWarp(void) return 0; } -const u8 *GetEventObjectScriptPointerPlayerFacing(void) +const u8 *GetObjectEventScriptPointerPlayerFacing(void) { u8 direction; struct MapPosition position; direction = GetPlayerMovementDirection(); GetInFrontOfPlayerPosition(&position); - return GetInteractedEventObjectScript(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), direction); + return GetInteractedObjectEventScript(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), direction); } int SetCableClubWarp(void) diff --git a/src/field_effect.c b/src/field_effect.c index 99abcdcb01..335de89b5a 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -101,11 +101,11 @@ static bool8 sub_80B72D0(struct Task *); static bool8 sub_80B72F4(struct Task *); static void sub_80B7384(u8); -static bool8 sub_80B73D0(struct Task *, struct EventObject *); -static bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *); -static bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *); -static bool8 sub_80B7450(struct Task *, struct EventObject *); -static bool8 sub_80B7478(struct Task *, struct EventObject *); +static bool8 sub_80B73D0(struct Task *, struct ObjectEvent *); +static bool8 waterfall_1_do_anim_probably(struct Task *, struct ObjectEvent *); +static bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct ObjectEvent *); +static bool8 sub_80B7450(struct Task *, struct ObjectEvent *); +static bool8 sub_80B7478(struct Task *, struct ObjectEvent *); static void Task_Dive(u8); static bool8 dive_1_lock(struct Task *); @@ -113,28 +113,28 @@ static bool8 dive_2_unknown(struct Task *); static bool8 dive_3_unknown(struct Task *); static void sub_80B75F0(u8); -static bool8 sub_80B764C(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7684(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B76B8(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7704(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B77F8(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7814(struct Task *, struct EventObject *, struct Sprite *); +static bool8 sub_80B764C(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7684(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B76B8(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7704(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B77F8(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7814(struct Task *, struct ObjectEvent *, struct Sprite *); static void mapldr_080851BC(void); static void sub_80B7890(u8); -static bool8 sub_80B78EC(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B791C(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7968(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B79BC(struct Task *, struct EventObject *, struct Sprite *); +static bool8 sub_80B78EC(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B791C(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7968(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B79BC(struct Task *, struct ObjectEvent *, struct Sprite *); static void sub_80B7A8C(u8); -static bool8 sub_80B7AE8(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7B18(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *); +static bool8 sub_80B7AE8(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7B18(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7B94(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7BCC(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7BF4(struct Task *, struct ObjectEvent *, struct Sprite *); static void DoEscapeRopeFieldEffect(u8); static void EscapeRopeFieldEffect_Step0(struct Task *); @@ -572,7 +572,7 @@ bool8 (*const gUnknown_0855C3FC[])(struct Task *) = sub_80B72F4, }; -bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = +bool8 (*const gUnknown_0855C418[])(struct Task *, struct ObjectEvent *) = { sub_80B73D0, waterfall_1_do_anim_probably, @@ -588,7 +588,7 @@ bool8 (*const gUnknown_0855C42C[])(struct Task *) = dive_3_unknown, }; -bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) = +bool8 (*const gUnknown_0855C438[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80B764C, sub_80B7684, @@ -598,7 +598,7 @@ bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct S sub_80B7814, }; -bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct Sprite *) = +bool8 (*const gUnknown_0855C450[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80B78EC, sub_80B791C, @@ -606,7 +606,7 @@ bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct S sub_80B79BC, }; -bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) = +bool8 (*const gUnknown_0855C460[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80B7AE8, sub_80B7B18, @@ -1375,7 +1375,7 @@ static void FieldCallback_Fly(void) pal_fill_black(); CreateTask(task00_8084310, 0); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1412,13 +1412,13 @@ static void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; if (gPlayerAvatar.flags & 0x08) { - EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST); + ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST); } ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1438,7 +1438,7 @@ static void c3_080843F8(u8 taskId) if (!FieldEffectActiveListContains(FLDEFF_FLY_IN)) { ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(taskId); } } @@ -1448,7 +1448,7 @@ void sub_80B6B68(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_80B6B94, 0); gFieldCallback = NULL; } @@ -1462,14 +1462,14 @@ static void sub_80B6B94(u8 taskId) static bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0] { - struct EventObject *playerObject; + struct ObjectEvent *playerObject; struct Sprite *playerSprite; - playerObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObject = &gObjectEvents[gPlayerAvatar.objectEventId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; gPlayerAvatar.preventStep = TRUE; - EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[4] = playerSprite->subspriteMode; playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; @@ -1496,7 +1496,7 @@ static bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; PlaySE(SE_RU_HYUU); task->data[0]++; return FALSE; @@ -1504,10 +1504,10 @@ static bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2] static bool8 sub_80B6D04(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->pos2.y += task->data[1]; if (task->data[1] < 8) @@ -1521,15 +1521,15 @@ static bool8 sub_80B6D04(struct Task *task) if (task->data[3] == 0 && sprite->pos2.y >= -16) { task->data[3]++; - eventObject->fixedPriority = 0; + objectEvent->fixedPriority = 0; sprite->subspriteMode = task->data[4]; - eventObject->triggerGroundEffectsOnMove = 1; + objectEvent->triggerGroundEffectsOnMove = 1; } if (sprite->pos2.y >= 0) { PlaySE(SE_W070); - eventObject->triggerGroundEffectsOnStop = 1; - eventObject->landingJump = 1; + objectEvent->triggerGroundEffectsOnStop = 1; + objectEvent->landingJump = 1; sprite->pos2.y = 0; task->data[0]++; } @@ -1566,7 +1566,7 @@ static bool8 sub_80B6E18(struct Task *task) gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); InstallCameraPanAheadCallback(); DestroyTask(FindTaskIdByFunc(sub_80B6B94)); return FALSE; @@ -1592,7 +1592,7 @@ static void sub_80B6E88(u8 taskId) static bool8 sub_80B6EC0(struct Task *task) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); sub_80E1558(task->data[1]); task->data[0]++; @@ -1601,11 +1601,11 @@ static bool8 sub_80B6EC0(struct Task *task) static bool8 sub_80B6EE0(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[0]++; task->data[2] = 0; task->data[3] = 0; @@ -1716,13 +1716,13 @@ static void sub_80B70DC(u8 taskId) static bool8 sub_80B7114(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; s16 x; s16 y; u8 behavior; CameraObjectReset2(); - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(DIR_EAST)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(DIR_EAST)); PlayerGetDestCoords(&x, &y); behavior = MapGridGetMetatileBehaviorAt(x, y); task->data[0]++; @@ -1812,13 +1812,13 @@ static bool8 sub_80B72D0(struct Task *task) static bool8 sub_80B72F4(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { CameraObjectReset1(); ScriptContext2_Disable(); - EventObjectSetHeldMovement(eventObject, GetWalkNormalMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetWalkNormalMovementAction(DIR_EAST)); DestroyTask(FindTaskIdByFunc(sub_80B70DC)); } return FALSE; @@ -1835,10 +1835,10 @@ bool8 FldEff_UseWaterfall(void) static void sub_80B7384(u8 taskId) { - while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])); + while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])); } -static bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject) +static bool8 sub_80B73D0(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1846,12 +1846,12 @@ static bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject) return FALSE; } -static bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject) +static bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); - if (!EventObjectIsMovementOverridden(eventObject)) + if (!ObjectEventIsMovementOverridden(objectEvent)) { - EventObjectClearHeldMovementIfFinished(eventObject); + ObjectEventClearHeldMovementIfFinished(objectEvent); gFieldEffectArguments[0] = task->data[1]; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); task->data[0]++; @@ -1859,7 +1859,7 @@ static bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject return FALSE; } -static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObject *eventObject) +static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent *objectEvent) { if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { @@ -1869,20 +1869,20 @@ static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct Eve return TRUE; } -static bool8 sub_80B7450(struct Task *task, struct EventObject *eventObject) +static bool8 sub_80B7450(struct Task *task, struct ObjectEvent *objectEvent) { - EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(DIR_NORTH)); + ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(DIR_NORTH)); task->data[0]++; return FALSE; } -static bool8 sub_80B7478(struct Task *task, struct EventObject *eventObject) +static bool8 sub_80B7478(struct Task *task, struct ObjectEvent *objectEvent) { - if (!EventObjectClearHeldMovementIfFinished(eventObject)) + if (!ObjectEventClearHeldMovementIfFinished(objectEvent)) { return FALSE; } - if (MetatileBehavior_IsWaterfall(eventObject->currentMetatileBehavior)) + if (MetatileBehavior_IsWaterfall(objectEvent->currentMetatileBehavior)) { task->data[0] = 3; return TRUE; @@ -1931,7 +1931,7 @@ static bool8 dive_3_unknown(struct Task *task) PlayerGetDestCoords(&mapPosition.x, &mapPosition.y); if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - dive_warp(&mapPosition, gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior); + dive_warp(&mapPosition, gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior); DestroyTask(FindTaskIdByFunc(Task_Dive)); FieldEffectActiveListRemove(FLDEFF_USE_DIVE); } @@ -1945,22 +1945,22 @@ void sub_80B75D8(u8 priority) static void sub_80B75F0(u8 taskId) { - while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 sub_80B764C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B764C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); SetCameraPanningCallback(NULL); gPlayerAvatar.preventStep = TRUE; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; task->data[1] = 1; task->data[0]++; return TRUE; } -static bool8 sub_80B7684(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7684(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetCameraPanning(0, task->data[1]); task->data[1] = -task->data[1]; @@ -1973,12 +1973,12 @@ static bool8 sub_80B7684(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B76B8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B76B8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = 0; task->data[3] = 1; - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP); @@ -1987,7 +1987,7 @@ static bool8 sub_80B76B8(struct Task *task, struct EventObject *eventObject, str return TRUE; } -static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7704(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { s16 centerToCornerVecY; SetCameraPanning(0, task->data[1]); @@ -2019,7 +2019,7 @@ static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, str if (task->data[5] == 0 && sprite->pos2.y < -0x10) { task->data[5]++; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; sprite->oam.priority = 1; sprite->subspriteMode = 2; } @@ -2030,7 +2030,7 @@ static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B77F8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { TryFadeOutOldMapMusic(); WarpFadeScreen(); @@ -2038,7 +2038,7 @@ static bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B7814(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7814(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -2061,25 +2061,25 @@ static void mapldr_080851BC(void) static void sub_80B7890(u8 taskId) { - while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 sub_80B78EC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B78EC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { CameraObjectReset2(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; task->data[0]++; return FALSE; } -static bool8 sub_80B791C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B791C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (IsWeatherNotFadingIn()) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -2088,27 +2088,27 @@ static bool8 sub_80B791C(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B7968(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7968(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite = &gSprites[task->data[1]]; if (sprite->animCmdIndex > 1) { task->data[0]++; - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; CameraObjectReset1(); PlaySE(SE_W091); - EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); } return FALSE; } -static bool8 sub_80B79BC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B79BC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_80B7890)); } return FALSE; @@ -2139,27 +2139,27 @@ void sub_80B7A74(u8 priority) static void sub_80B7A8C(u8 taskId) { - while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 sub_80B7AE8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7AE8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); gPlayerAvatar.preventStep = TRUE; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; task->data[0]++; return FALSE; } -static bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7B18(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { if (task->data[1] > 3) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -2167,24 +2167,24 @@ static bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, str } else { task->data[1]++; - EventObjectSetHeldMovement(eventObject, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); + ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } return FALSE; } -static bool8 sub_80B7B94(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7B94(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (gSprites[task->data[1]].animCmdIndex == 2) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; task->data[0]++; } return FALSE; } -static bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7BCC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { @@ -2195,7 +2195,7 @@ static bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B7BF4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7BF4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -2228,7 +2228,7 @@ void sub_80B7CAC(struct Sprite *sprite) void StartEscapeRopeFieldEffect(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(DoEscapeRopeFieldEffect, 0x50); } @@ -2246,19 +2246,19 @@ static void EscapeRopeFieldEffect_Step0(struct Task *task) static void EscapeRopeFieldEffect_Step1(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; if (task->data[14] != 0 && (--task->data[14]) == 0) { TryFadeOutOldMapMusic(); WarpFadeScreen(); } - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { if (task->data[14] == 0 && !gPaletteFade.active && BGMusicStopped() == TRUE) { - SetEventObjectDirection(eventObject, task->data[15]); + SetObjectEventDirection(objectEvent, task->data[15]); SetWarpDestinationToEscapeWarp(); WarpIntoMap(); gFieldCallback = mapldr_080859D4; @@ -2266,7 +2266,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) DestroyTask(FindTaskIdByFunc(DoEscapeRopeFieldEffect)); } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection])); if (task->data[2] < 12) { task->data[2]++; @@ -2286,9 +2286,9 @@ static void mapldr_080859D4(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; CreateTask(sub_80B7E94, 0); } @@ -2309,29 +2309,29 @@ static void sub_80B7EC4(struct Task *task) static void sub_80B7EE8(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - if (EventObjectIsMovementOverridden(eventObject) && !EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventIsMovementOverridden(objectEvent) && !ObjectEventClearHeldMovementIfFinished(objectEvent)) { return; } if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_80B7E94)); return; } - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection])); if (task->data[2] < 32) { task->data[2]++; } task->data[1] = task->data[2] >> 2; } - eventObject->invisible ^= 1; + objectEvent->invisible ^= 1; } void CreateTeleportFieldEffectTask(void) @@ -2354,7 +2354,7 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId) static void TeleportFieldEffectTask1(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); task->data[15] = GetPlayerFacingDirection(); task->data[0]++; @@ -2363,14 +2363,14 @@ static void TeleportFieldEffectTask1(struct Task *task) static void TeleportFieldEffectTask2(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); task->data[1] = 8; task->data[2]++; } - if (task->data[2] > 7 && task->data[15] == eventObject->facingDirection) + if (task->data[2] > 7 && task->data[15] == objectEvent->facingDirection) { task->data[0]++; task->data[1] = 4; @@ -2383,12 +2383,12 @@ static void TeleportFieldEffectTask2(struct Task *task) static void TeleportFieldEffectTask3(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((--task->data[1]) <= 0) { task->data[1] = 4; - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } sprite->pos1.y -= task->data[3]; task->data[4] += task->data[3]; @@ -2434,9 +2434,9 @@ static void mapldr_08085D88(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; CameraObjectReset2(); CreateTask(sub_80B8250, 0); } @@ -2461,7 +2461,7 @@ static void sub_80B8280(struct Task *task) sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; task->data[0]++; task->data[1] = 8; task->data[2] = 1; @@ -2474,14 +2474,14 @@ static void sub_80B8280(struct Task *task) static void sub_80B830C(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((sprite->pos2.y += task->data[1]) >= -8) { if (task->data[13] == 0) { task->data[13]++; - eventObject->triggerGroundEffectsOnMove = 1; + objectEvent->triggerGroundEffectsOnMove = 1; sprite->subspriteMode = task->data[14]; } } else @@ -2499,7 +2499,7 @@ static void sub_80B830C(struct Task *task) if ((--task->data[2]) == 0) { task->data[2] = 4; - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } if (sprite->pos2.y >= 0) { @@ -2513,16 +2513,16 @@ static void sub_80B830C(struct Task *task) static void sub_80B8410(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if ((--task->data[1]) == 0) { - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); task->data[1] = 8; - if ((++task->data[2]) > 4 && task->data[14] == eventObject->facingDirection) + if ((++task->data[2]) > 4 && task->data[14] == objectEvent->facingDirection) { ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_80B8250)); } } @@ -2952,31 +2952,31 @@ static void sub_80B8D84(u8 taskId) static void sub_80B8DB4(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(8); PlayerGetDestCoords(&task->data[1], &task->data[2]); - MoveCoords(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection, &task->data[1], &task->data[2]); + MoveCoords(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection, &task->data[1], &task->data[2]); task->data[0]++; } static void sub_80B8E14(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { sub_808C114(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } static void sub_80B8E60(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectCheckHeldMovementStatus(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventCheckHeldMovementStatus(objectEvent)) { gFieldEffectArguments[0] = task->data[15] | 0x80000000; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); @@ -2986,32 +2986,32 @@ static void sub_80B8E60(struct Task *task) static void sub_80B8EA8(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(3)); - EventObjectClearHeldMovementIfFinished(eventObject); - EventObjectSetHeldMovement(eventObject, GetJumpSpecialMovementAction(eventObject->movementDirection)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(3)); + ObjectEventClearHeldMovementIfFinished(objectEvent); + ObjectEventSetHeldMovement(objectEvent, GetJumpSpecialMovementAction(objectEvent->movementDirection)); gFieldEffectArguments[0] = task->data[1]; gFieldEffectArguments[1] = task->data[2]; - gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); + gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); task->data[0]++; } } static void sub_80B8F24(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= 0xdf; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(eventObject->movementDirection)); - sub_81555AC(eventObject->fieldEffectSpriteId, 1); - UnfreezeEventObjects(); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection)); + sub_81555AC(objectEvent->fieldEffectSpriteId, 1); + UnfreezeObjectEvents(); ScriptContext2_Disable(); FieldEffectActiveListRemove(FLDEFF_USE_SURF); DestroyTask(FindTaskIdByFunc(sub_80B8D84)); @@ -3116,22 +3116,22 @@ static void sub_80B91D4(u8 taskId) static void sub_80B9204(struct Task *task) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[15] = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(1); sub_808C114(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } static void sub_80B925C(struct Task *task) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; gFieldEffectArguments[0] = task->data[1]; @@ -3143,11 +3143,11 @@ static void sub_80B92A0(struct Task *task) { if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[15] & 0x08) { - sub_81555AC(eventObject->fieldEffectSpriteId, 2); - sub_81555D8(eventObject->fieldEffectSpriteId, 0); + sub_81555AC(objectEvent->fieldEffectSpriteId, 2); + sub_81555D8(objectEvent->fieldEffectSpriteId, 0); } task->data[1] = sub_80B94C4(); task->data[0]++; @@ -3161,14 +3161,14 @@ static void sub_80B92F8(struct Task *task) task->data[0]++; task->data[2] = 16; SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], MOVEMENT_ACTION_FACE_LEFT); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], MOVEMENT_ACTION_FACE_LEFT); } } static void sub_80B933C(struct Task *task) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; PlaySE(SE_W019); @@ -3180,14 +3180,14 @@ static void sub_80B9390(struct Task *task) { if ((++task->data[2]) >= 8) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x03)); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->inanimate = 1; - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0x03)); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->inanimate = 1; + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); if (task->data[15] & 0x08) { - DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]); + DestroySprite(&gSprites[objectEvent->fieldEffectSpriteId]); } task->data[0]++; task->data[2] = 0; @@ -3198,11 +3198,11 @@ static void sub_80B9418(struct Task *task) { if ((++task->data[2]) >= 10) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectClearHeldMovementIfActive(eventObject); - eventObject->inanimate = 0; - eventObject->hasShadow = 0; - sub_80B9560(task->data[1], eventObject->spriteId); + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(objectEvent); + objectEvent->inanimate = 0; + objectEvent->hasShadow = 0; + sub_80B9560(task->data[1], objectEvent->spriteId); CameraObjectReset2(); task->data[0]++; } @@ -3404,9 +3404,9 @@ static void sub_80B97D4(u8 taskId) static void sub_80B9804(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; task->data[2] = 17; @@ -3415,27 +3415,27 @@ static void sub_80B9804(struct Task *task) SetPlayerAvatarStateMask(0x01); if (task->data[15] & 0x08) { - sub_81555AC(eventObject->fieldEffectSpriteId, 0); + sub_81555AC(objectEvent->fieldEffectSpriteId, 0); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x3)); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0x3)); CameraObjectReset2(); - EventObjectTurn(eventObject, DIR_WEST); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->invisible = FALSE; + ObjectEventTurn(objectEvent, DIR_WEST); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->invisible = FALSE; task->data[1] = sub_80B94C4(); sub_80B9524(task->data[1]); - sub_80B9560(task->data[1], eventObject->spriteId); + sub_80B9560(task->data[1], objectEvent->spriteId); } } static void sub_80B98B8(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (task->data[2] == 0 || (--task->data[2]) == 0) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; sub_80B9560(task->data[1], 0x40); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -3478,26 +3478,26 @@ static void sub_80B9924(struct Task *task) static void sub_80B9978(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (sub_80B9508(task->data[1])) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; - eventObject->inanimate = 0; - MoveEventObjectToMapCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; + objectEvent->inanimate = 0; + MoveObjectEventToMapCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; sub_808C114(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } static void sub_80B99F0(struct Task *task) { - if (EventObjectClearHeldMovementIfFinished(&gEventObjects[gPlayerAvatar.eventObjectId])) + if (ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gPlayerAvatar.objectEventId])) { task->data[0]++; sub_80B9794(task->data[1]); @@ -3517,18 +3517,18 @@ static void sub_80B9A28(struct Task *task) static void sub_80B9A60(struct Task *task) { u8 state; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((--task->data[1]) == 0) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; state = 0; if (task->data[15] & 0x08) { state = 3; - sub_81555AC(eventObject->fieldEffectSpriteId, 1); + sub_81555AC(objectEvent->fieldEffectSpriteId, 1); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(state)); - EventObjectTurn(eventObject, DIR_SOUTH); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(state)); + ObjectEventTurn(objectEvent, DIR_SOUTH); gPlayerAvatar.flags = task->data[15]; gPlayerAvatar.preventStep = FALSE; FieldEffectActiveListRemove(FLDEFF_FLY_IN); @@ -3539,11 +3539,11 @@ static void sub_80B9A60(struct Task *task) bool8 sub_80B9ADC(void) { u8 taskId; - u8 eventObjectIdBuffer; - if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer)) + u8 objectEventIdBuffer; + if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer)) { taskId = CreateTask(sub_80B9BE8, 0x50); - gTasks[taskId].data[2] = eventObjectIdBuffer; + gTasks[taskId].data[2] = objectEventIdBuffer; gTasks[taskId].data[6] = gFieldEffectArguments[0]; gTasks[taskId].data[7] = gFieldEffectArguments[1]; gTasks[taskId].data[8] = gFieldEffectArguments[2]; @@ -3622,8 +3622,8 @@ void sub_80B9C54(s16* data, u8 taskId) { if (++data[3] > 0x78) { - struct Sprite *sprite = &gSprites[gEventObjects[data[2]].spriteId]; - gEventObjects[data[2]].invisible = TRUE; + struct Sprite *sprite = &gSprites[gObjectEvents[data[2]].spriteId]; + gObjectEvents[data[2]].invisible = TRUE; BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE); BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE); sub_80B9D24(sprite); @@ -3639,7 +3639,7 @@ void sub_80B9CDC(s16* a0, u8 taskId) if (!gPaletteFade.active && !FuncIsActiveTask(sub_80B9B3C)) { InstallCameraPanAheadCallback(); - RemoveEventObjectByLocalIdAndMap(a0[6], a0[7], a0[8]); + RemoveObjectEventByLocalIdAndMap(a0[6], a0[7], a0[8]); FieldEffectActiveListRemove(0x41); DestroyTask(taskId); } @@ -3734,24 +3734,24 @@ static void sub_80B9DB8(struct Sprite* sprite) bool8 Fldeff_MoveDeoxysRock(struct Sprite* sprite) { - u8 eventObjectIdBuffer; - if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer)) + u8 objectEventIdBuffer; + if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer)) { - struct EventObject *object; + struct ObjectEvent *object; int xPos, yPos; u8 taskId; - object = &gEventObjects[eventObjectIdBuffer]; + object = &gObjectEvents[objectEventIdBuffer]; xPos = object->currentCoords.x - 7; yPos = object->currentCoords.y - 7; xPos = (gFieldEffectArguments[3] - xPos) * 16; yPos = (gFieldEffectArguments[4] - yPos) * 16; - ShiftEventObjectCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7); + ShiftObjectEventCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7); taskId = CreateTask(Fldeff_MoveDeoxysRock_Step, 0x50); gTasks[taskId].data[1] = object->spriteId; gTasks[taskId].data[2] = gSprites[object->spriteId].pos1.x + xPos; gTasks[taskId].data[3] = gSprites[object->spriteId].pos1.y + yPos; gTasks[taskId].data[8] = gFieldEffectArguments[5]; - gTasks[taskId].data[9] = eventObjectIdBuffer; + gTasks[taskId].data[9] = objectEventIdBuffer; } return FALSE; } @@ -3780,10 +3780,10 @@ static void Fldeff_MoveDeoxysRock_Step(u8 taskId) } else { - struct EventObject *object = &gEventObjects[data[9]]; + struct ObjectEvent *object = &gObjectEvents[data[9]]; sprite->pos1.x = data[2]; sprite->pos1.y = data[3]; - ShiftStillEventObjectCoords(object); + ShiftStillObjectEventCoords(object); object->triggerGroundEffectsOnStop = TRUE; FieldEffectActiveListRemove(0x42); DestroyTask(taskId); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 8db58ad7af..98e9c03c13 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -16,9 +16,9 @@ #define EVENT_OBJ_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c static void UpdateObjectReflectionSprite(struct Sprite *); -static void LoadObjectReflectionPalette(struct EventObject *eventObject, struct Sprite *sprite); -static void LoadObjectHighBridgeReflectionPalette(struct EventObject *, u8); -static void LoadObjectRegularReflectionPalette(struct EventObject *, u8); +static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite); +static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *, u8); +static void LoadObjectRegularReflectionPalette(struct ObjectEvent *, u8); static void sub_81561FC(struct Sprite *, u8, u8); static void FadeFootprintsTireTracks_Step0(struct Sprite *); static void FadeFootprintsTireTracks_Step1(struct Sprite *); @@ -26,13 +26,13 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *); static void UpdateAshFieldEffect_Step0(struct Sprite *); static void UpdateAshFieldEffect_Step1(struct Sprite *); static void UpdateAshFieldEffect_Step2(struct Sprite *); -static void SynchroniseSurfAnim(struct EventObject *, struct Sprite *); -static void sub_81556E8(struct EventObject *, struct Sprite *); -static void CreateBobbingEffect(struct EventObject *, struct Sprite *, struct Sprite *); +static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *); +static void sub_81556E8(struct ObjectEvent *, struct Sprite *); +static void CreateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sprite *); static void sub_8155850(struct Sprite *); static u32 ShowDisguiseFieldEffect(u8, u8, u8); -void SetUpReflection(struct EventObject *eventObject, struct Sprite *sprite, bool8 stillReflection) +void SetUpReflection(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 stillReflection) { struct Sprite *reflectionSprite; @@ -47,40 +47,40 @@ void SetUpReflection(struct EventObject *eventObject, struct Sprite *sprite, boo reflectionSprite->affineAnimBeginning = TRUE; reflectionSprite->subspriteMode = SUBSPRITES_OFF; reflectionSprite->data[0] = sprite->data[0]; - reflectionSprite->data[1] = eventObject->localId; + reflectionSprite->data[1] = objectEvent->localId; reflectionSprite->data[7] = stillReflection; - LoadObjectReflectionPalette(eventObject, reflectionSprite); + LoadObjectReflectionPalette(objectEvent, reflectionSprite); if (!stillReflection) reflectionSprite->oam.affineMode = ST_OAM_AFFINE_NORMAL; } -static s16 GetReflectionVerticalOffset(struct EventObject *eventObject) +static s16 GetReflectionVerticalOffset(struct ObjectEvent *objectEvent) { - return GetEventObjectGraphicsInfo(eventObject->graphicsId)->height - 2; + return GetObjectEventGraphicsInfo(objectEvent->graphicsId)->height - 2; } -static void LoadObjectReflectionPalette(struct EventObject *eventObject, struct Sprite *sprite) +static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 bridgeType; u16 bridgeReflectionVerticalOffsets[] = { 12, 28, 44 }; sprite->data[2] = 0; - if (!GetEventObjectGraphicsInfo(eventObject->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(eventObject->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(eventObject->currentMetatileBehavior)))) + if (!GetObjectEventGraphicsInfo(objectEvent->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(objectEvent->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(objectEvent->currentMetatileBehavior)))) { sprite->data[2] = bridgeReflectionVerticalOffsets[bridgeType - 1]; - LoadObjectHighBridgeReflectionPalette(eventObject, sprite->oam.paletteNum); + LoadObjectHighBridgeReflectionPalette(objectEvent, sprite->oam.paletteNum); } else { - LoadObjectRegularReflectionPalette(eventObject, sprite->oam.paletteNum); + LoadObjectRegularReflectionPalette(objectEvent, sprite->oam.paletteNum); } } -static void LoadObjectRegularReflectionPalette(struct EventObject *eventObject, u8 paletteIndex) +static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent, u8 paletteIndex) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE) { if (graphicsInfo->paletteSlot == 0) @@ -101,11 +101,11 @@ static void LoadObjectRegularReflectionPalette(struct EventObject *eventObject, // When walking on a bridge high above water (Route 120), the reflection is a solid dark blue color. // This is so the sprite blends in with the dark water metatile underneath the bridge. -static void LoadObjectHighBridgeReflectionPalette(struct EventObject *eventObject, u8 paletteNum) +static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *objectEvent, u8 paletteNum) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE) { PatchObjectPalette(graphicsInfo->paletteTag2, paletteNum); @@ -115,12 +115,12 @@ static void LoadObjectHighBridgeReflectionPalette(struct EventObject *eventObjec static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *mainSprite; - eventObject = &gEventObjects[reflectionSprite->data[0]]; - mainSprite = &gSprites[eventObject->spriteId]; - if (!eventObject->active || !eventObject->hasReflection || eventObject->localId != reflectionSprite->data[1]) + objectEvent = &gObjectEvents[reflectionSprite->data[0]]; + mainSprite = &gSprites[objectEvent->spriteId]; + if (!objectEvent->active || !objectEvent->hasReflection || objectEvent->localId != reflectionSprite->data[1]) { reflectionSprite->inUse = FALSE; } @@ -136,14 +136,14 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) reflectionSprite->invisible = mainSprite->invisible; reflectionSprite->pos1.x = mainSprite->pos1.x; // reflectionSprite->data[2] holds an additional vertical offset, used by the high bridges on Route 120 - reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(eventObject) + reflectionSprite->data[2]; + reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->data[2]; reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX; reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY; reflectionSprite->pos2.x = mainSprite->pos2.x; reflectionSprite->pos2.y = -mainSprite->pos2.y; reflectionSprite->coordOffsetEnabled = mainSprite->coordOffsetEnabled; - if (eventObject->hideReflection == TRUE) + if (objectEvent->hideReflection == TRUE) reflectionSprite->invisible = TRUE; // Check if the reflection is not still. @@ -218,12 +218,12 @@ const u16 gShadowVerticalOffsets[] = { u32 FldEff_Shadow(void) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; u8 spriteId; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[gShadowEffectTemplateIds[graphicsInfo->shadowSize]], 0, 0, 0x94); if (spriteId != MAX_SPRITES) { @@ -238,27 +238,27 @@ u32 FldEff_Shadow(void) void UpdateShadowFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId)) { FieldEffectStop(sprite, FLDEFF_SHADOW); } else { - eventObject = &gEventObjects[eventObjectId]; - linkedSprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[objectEventId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3]; - if (!eventObject->active || !eventObject->hasShadow - || MetatileBehavior_IsPokeGrass(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->previousMetatileBehavior) - || MetatileBehavior_IsReflective(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsReflective(eventObject->previousMetatileBehavior)) + if (!objectEvent->active || !objectEvent->hasShadow + || MetatileBehavior_IsPokeGrass(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->previousMetatileBehavior) + || MetatileBehavior_IsReflective(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsReflective(objectEvent->previousMetatileBehavior)) { FieldEffectStop(sprite, FLDEFF_SHADOW); } @@ -301,8 +301,8 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) u8 mapGroup; u8 metatileBehavior; u8 localId; - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; mapNum = sprite->data[5] >> 8; mapGroup = sprite->data[5]; @@ -316,21 +316,21 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[3]; mapGroup = sprite->data[4]; metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_TALL_GRASS); } else { - eventObject = &gEventObjects[eventObjectId]; - if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2])) + objectEvent = &gObjectEvents[objectEventId]; + if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2])) sprite->data[7] = TRUE; metatileBehavior = 0; if (sprite->animCmdIndex == 0) metatileBehavior = 4; - UpdateEventObjectSpriteVisibility(sprite, 0); + UpdateObjectEventSpriteVisibility(sprite, 0); sub_81561FC(sprite, sprite->data[0], metatileBehavior); } } @@ -407,8 +407,8 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite) u8 mapGroup; u8 metatileBehavior; u8 localId; - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; mapNum = sprite->data[5] >> 8; mapGroup = sprite->data[5]; @@ -422,18 +422,18 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[3]; mapGroup = sprite->data[4]; metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_LONG_GRASS); } else { - eventObject = &gEventObjects[eventObjectId]; - if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2])) + objectEvent = &gObjectEvents[objectEventId]; + if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2])) { sprite->data[7] = TRUE; } - UpdateEventObjectSpriteVisibility(sprite, 0); + UpdateObjectEventSpriteVisibility(sprite, 0); sub_81561FC(sprite, sprite->data[0], 0); } } @@ -458,44 +458,44 @@ u32 FldEff_JumpLongGrass(void) u32 FldEff_ShortGrass(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0); if (spriteId != MAX_SPRITES) { sprite = &(gSprites[spriteId]); sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; } return 0; } void UpdateShortGrassFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; s16 x; s16 y; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShortGrass) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShortGrass) { FieldEffectStop(sprite, FLDEFF_SHORT_GRASS); } else { - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; y = linkedSprite->pos1.y; x = linkedSprite->pos1.x; if (x != sprite->data[3] || y != sprite->data[4]) @@ -512,7 +512,7 @@ void UpdateShortGrassFieldEffect(struct Sprite *sprite) sprite->pos2.y = (graphicsInfo->height >> 1) - 8; sprite->subpriority = linkedSprite->subpriority - 1; sprite->oam.priority = linkedSprite->oam.priority; - UpdateEventObjectSpriteVisibility(sprite, linkedSprite->invisible); + UpdateObjectEventSpriteVisibility(sprite, linkedSprite->invisible); } } @@ -586,14 +586,14 @@ static void FadeFootprintsTireTracks_Step0(struct Sprite *sprite) if (++sprite->data[1] > 40) sprite->data[0] = 1; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) { sprite->invisible ^= 1; sprite->data[1]++; - UpdateEventObjectSpriteVisibility(sprite, sprite->invisible); + UpdateObjectEventSpriteVisibility(sprite, sprite->invisible); if (sprite->data[1] > 56) { FieldEffectStop(sprite, sprite->data[7]); @@ -602,22 +602,22 @@ static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) u32 FldEff_Splash(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - linkedSprite = &gSprites[eventObject->spriteId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; @@ -630,17 +630,17 @@ u32 FldEff_Splash(void) void UpdateSplashFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; - if (sprite->animEnded || TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId)) + if (sprite->animEnded || TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId)) { FieldEffectStop(sprite, FLDEFF_SPLASH); } else { - sprite->pos1.x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x; - sprite->pos1.y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + sprite->pos1.x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; + sprite->pos1.y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -682,22 +682,22 @@ u32 FldEff_JumpBigSplash(void) u32 FldEff_FeetInFlowingWater(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->callback = UpdateFeetInFlowingWaterFieldEffect; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; @@ -711,26 +711,26 @@ u32 FldEff_FeetInFlowingWater(void) static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; struct Sprite *linkedSprite; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShallowFlowingWater) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShallowFlowingWater) { FieldEffectStop(sprite, FLDEFF_FEET_IN_FLOWING_WATER); } else { - eventObject = &gEventObjects[eventObjectId]; - linkedSprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[objectEventId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = linkedSprite->pos1.y; sprite->subpriority = linkedSprite->subpriority; - UpdateEventObjectSpriteVisibility(sprite, FALSE); - if (eventObject->currentCoords.x != sprite->data[3] || eventObject->currentCoords.y != sprite->data[4]) + UpdateObjectEventSpriteVisibility(sprite, FALSE); + if (objectEvent->currentCoords.x != sprite->data[3] || objectEvent->currentCoords.y != sprite->data[4]) { - sprite->data[3] = eventObject->currentCoords.x; - sprite->data[4] = eventObject->currentCoords.y; + sprite->data[3] = objectEvent->currentCoords.x; + sprite->data[4] = objectEvent->currentCoords.y; if (!sprite->invisible) { PlaySE(SE_MIZU); @@ -757,46 +757,46 @@ u32 FldEff_Ripple(void) u32 FldEff_HotSpringsWater(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[31], 0, 0, 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; } return 0; } void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inHotSprings) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inHotSprings) { FieldEffectStop(sprite, FLDEFF_HOT_SPRINGS_WATER); } else { - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8; sprite->subpriority = linkedSprite->subpriority - 1; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -928,13 +928,13 @@ static void UpdateAshFieldEffect_Step1(struct Sprite *sprite) sprite->animPaused = FALSE; MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]); CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]); - gEventObjects[gPlayerAvatar.eventObjectId].triggerGroundEffectsOnMove = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].triggerGroundEffectsOnMove = TRUE; sprite->data[0] = 2; } static void UpdateAshFieldEffect_Step2(struct Sprite *sprite) { - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); if (sprite->animEnded) FieldEffectStop(sprite, FLDEFF_ASH); } @@ -993,18 +993,18 @@ static u8 sub_815564C(struct Sprite *sprite) void UpdateSurfBlobFieldEffect(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *linkedSprite; - eventObject = &gEventObjects[sprite->data[2]]; - linkedSprite = &gSprites[eventObject->spriteId]; - SynchroniseSurfAnim(eventObject, sprite); - sub_81556E8(eventObject, sprite); - CreateBobbingEffect(eventObject, linkedSprite, sprite); + objectEvent = &gObjectEvents[sprite->data[2]]; + linkedSprite = &gSprites[objectEvent->spriteId]; + SynchroniseSurfAnim(objectEvent, sprite); + sub_81556E8(objectEvent, sprite); + CreateBobbingEffect(objectEvent, linkedSprite, sprite); sprite->oam.priority = linkedSprite->oam.priority; } -static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite) +static void SynchroniseSurfAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 surfBlobDirectionAnims[] = { [DIR_NONE] = 0, @@ -1019,14 +1019,14 @@ static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite * }; if (sub_8155640(sprite) == 0) - StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[eventObject->movementDirection]); + StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[objectEvent->movementDirection]); } -void sub_81556E8(struct EventObject *eventObject, struct Sprite *sprite) +void sub_81556E8(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 i; - s16 x = eventObject->currentCoords.x; - s16 y = eventObject->currentCoords.y; + s16 x = objectEvent->currentCoords.x; + s16 y = objectEvent->currentCoords.y; s32 spriteY = sprite->pos2.y; if (spriteY == 0 && (x != sprite->data[6] || y != sprite->data[7])) @@ -1046,7 +1046,7 @@ void sub_81556E8(struct EventObject *eventObject, struct Sprite *sprite) } } -static void CreateBobbingEffect(struct EventObject *eventObject, struct Sprite *linkedSprite, struct Sprite *sprite) +static void CreateBobbingEffect(struct ObjectEvent *objectEvent, struct Sprite *linkedSprite, struct Sprite *sprite) { u16 unk_085CDC6A[] = {3, 7}; u8 v0 = sub_8155638(sprite); @@ -1121,26 +1121,26 @@ u32 FldEff_Dust(void) u32 FldEff_SandPile(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[29], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; sprite->pos2.y = (graphicsInfo->height >> 1) - 2; SeekSpriteAnim(sprite, 2); } @@ -1149,18 +1149,18 @@ u32 FldEff_SandPile(void) void UpdateSandPileFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; s16 x; s16 y; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inSandPile) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inSandPile) { FieldEffectStop(sprite, FLDEFF_SAND_PILE); } else { - y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y; - x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x; + y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; + x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; if (x != sprite->data[3] || y != sprite->data[4]) { sprite->data[3] = x; @@ -1172,8 +1172,8 @@ void UpdateSandPileFieldEffect(struct Sprite *sprite) } sprite->pos1.x = x; sprite->pos1.y = y; - sprite->subpriority = gSprites[gEventObjects[eventObjectId].spriteId].subpriority; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + sprite->subpriority = gSprites[gObjectEvents[objectEventId].spriteId].subpriority; + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -1198,7 +1198,7 @@ void UpdateBubblesFieldEffect(struct Sprite *sprite) sprite->data[0] += 0x80; sprite->data[0] &= 0x100; sprite->pos1.y -= sprite->data[0] >> 8; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); if (sprite->invisible || sprite->animEnded) { FieldEffectStop(sprite, FLDEFF_BUBBLES); @@ -1243,7 +1243,7 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) u8 spriteId; struct Sprite *sprite; - if (TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId)) + if (TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId)) { FieldEffectActiveListRemove(fldEff); return MAX_SPRITES; @@ -1264,17 +1264,17 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) void UpdateDisguiseFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &objectEventId)) { FieldEffectStop(sprite, sprite->data[1]); } - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->invisible = linkedSprite->invisible; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16; @@ -1294,30 +1294,30 @@ void UpdateDisguiseFieldEffect(struct Sprite *sprite) } } -void sub_8155D78(struct EventObject *eventObject) +void sub_8155D78(struct ObjectEvent *objectEvent) { - if (eventObject->directionSequenceIndex == 1) + if (objectEvent->directionSequenceIndex == 1) { - gSprites[eventObject->fieldEffectSpriteId].data[0]++; + gSprites[objectEvent->fieldEffectSpriteId].data[0]++; } } -bool8 sub_8155DA0(struct EventObject *eventObject) +bool8 sub_8155DA0(struct ObjectEvent *objectEvent) { struct Sprite *sprite; - if (eventObject->directionSequenceIndex == 2) + if (objectEvent->directionSequenceIndex == 2) { return TRUE; } - if (eventObject->directionSequenceIndex == 0) + if (objectEvent->directionSequenceIndex == 0) { return TRUE; } - sprite = &gSprites[eventObject->fieldEffectSpriteId]; + sprite = &gSprites[objectEvent->fieldEffectSpriteId]; if (sprite->data[7]) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; sprite->data[0]++; return TRUE; } @@ -1532,7 +1532,7 @@ void sub_8156194(struct Sprite *sprite) } else { - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0); } } @@ -1542,24 +1542,24 @@ void WaitFieldEffectSpriteAnim(struct Sprite *sprite) if (sprite->animEnded) FieldEffectStop(sprite, sprite->data[0]); else - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset) { u8 i; s16 var, xhi, lyhi, yhi, ylo; - const struct EventObjectGraphicsInfo *graphicsInfo; // Unused Variable + const struct ObjectEventGraphicsInfo *graphicsInfo; // Unused Variable struct Sprite *linkedSprite; SetObjectSubpriorityByZCoord(z, sprite, offset); for (i = 0; i < EVENT_OBJECTS_COUNT; i ++) { - struct EventObject *eventObject = &gEventObjects[i]; - if (eventObject->active) + struct ObjectEvent *objectEvent = &gObjectEvents[i]; + if (objectEvent->active) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); - linkedSprite = &gSprites[eventObject->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); + linkedSprite = &gSprites[objectEvent->spriteId]; xhi = sprite->pos1.x + sprite->centerToCornerVecX; var = sprite->pos1.x - sprite->centerToCornerVecX; if (xhi < linkedSprite->pos1.x && var > linkedSprite->pos1.x) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 229e5aedb7..f4f5f82bc3 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -32,14 +32,14 @@ #include "constants/species.h" static EWRAM_DATA u8 gUnknown_0203734C = 0; -EWRAM_DATA struct EventObject gEventObjects[EVENT_OBJECTS_COUNT] = {}; +EWRAM_DATA struct ObjectEvent gObjectEvents[EVENT_OBJECTS_COUNT] = {}; EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {}; // static declarations -static u8 EventObjectCB2_NoMovement2(); -static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *, u8); -static void npc_clear_strange_bits(struct EventObject *); +static u8 ObjectEventCB2_NoMovement2(); +static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *, u8); +static void npc_clear_strange_bits(struct ObjectEvent *); static void MovePlayerAvatarUsingKeypadInput(u8, u16, u16); static void PlayerAllowForcedMovementIfMovingSameDirection(); static bool8 TryDoMetatileBehaviorForcedMovement(); @@ -70,20 +70,20 @@ static void PlayerNotOnBikeTurningInPlace(u8, u16); static void PlayerNotOnBikeMoving(u8, u16); static u8 CheckForPlayerAvatarCollision(u8); static u8 sub_808B028(u8); -static u8 sub_808B164(struct EventObject *, s16, s16, u8, u8); +static u8 sub_808B164(struct ObjectEvent *, s16, s16, u8, u8); static bool8 CanStopSurfing(s16, s16, u8); static bool8 ShouldJumpLedge(s16, s16, u8); static bool8 TryPushBoulder(s16, s16, u8); static void CheckAcroBikeCollision(s16, s16, u8, u8 *); static void DoPlayerAvatarTransition(void); -static void PlayerAvatarTransition_Dummy(struct EventObject *a); -static void PlayerAvatarTransition_Normal(struct EventObject *a); -static void PlayerAvatarTransition_MachBike(struct EventObject *a); -static void PlayerAvatarTransition_AcroBike(struct EventObject *a); -static void PlayerAvatarTransition_Surfing(struct EventObject *a); -static void PlayerAvatarTransition_Underwater(struct EventObject *a); -static void PlayerAvatarTransition_ReturnToField(struct EventObject *a); +static void PlayerAvatarTransition_Dummy(struct ObjectEvent *a); +static void PlayerAvatarTransition_Normal(struct ObjectEvent *a); +static void PlayerAvatarTransition_MachBike(struct ObjectEvent *a); +static void PlayerAvatarTransition_AcroBike(struct ObjectEvent *a); +static void PlayerAvatarTransition_Surfing(struct ObjectEvent *a); +static void PlayerAvatarTransition_Underwater(struct ObjectEvent *a); +static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *a); static bool8 player_is_anim_in_certain_ranges(void); static bool8 sub_808B618(void); @@ -96,24 +96,24 @@ static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8); static void PlayCollisionSoundIfNotFacingWarp(u8 a); -static void sub_808C280(struct EventObject *); +static void sub_808C280(struct ObjectEvent *); static void StartStrengthAnim(u8, u8); static void Task_BumpBoulder(u8 taskId); -static u8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); -static u8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); -static u8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); +static u8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject); +static u8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject); +static u8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject); static void DoPlayerMatJump(void); static void DoPlayerAvatarSecretBaseMatJump(u8 taskId); -static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject); +static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent); static void DoPlayerMatSpin(void); static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId); -static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject); +static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent); static void CreateStopSurfingTask(u8); static void Task_StopSurfingInit(u8 taskId); @@ -138,7 +138,7 @@ static u8 Fishing15(struct Task *task); static u8 Fishing16(struct Task *task); static void AlignFishingAnimationFrames(void); -static u8 sub_808D38C(struct EventObject *object, s16 *a1); +static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1); // .rodata @@ -211,7 +211,7 @@ static const u8 sAcroBikeTrickCollisionTypes[] = { COLLISION_HORIZONTAL_RAIL, }; -static void (*const gUnknown_084974B8[])(struct EventObject *) = +static void (*const gUnknown_084974B8[])(struct ObjectEvent *) = { PlayerAvatarTransition_Normal, PlayerAvatarTransition_MachBike, @@ -287,19 +287,19 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of MetatileBehavior_IsEastArrowWarp, }; -static bool8 (*const gUnknown_08497530[])(struct Task *, struct EventObject *, struct EventObject *) = +static bool8 (*const gUnknown_08497530[])(struct Task *, struct ObjectEvent *, struct ObjectEvent *) = { sub_808C3A4, do_boulder_dust, sub_808C484, }; -static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct EventObject *) = +static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct ObjectEvent *) = { PlayerAvatar_DoSecretBaseMatJump, }; -static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct EventObject *) = +static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct ObjectEvent *) = { PlayerAvatar_SecretBaseMatSpinStep0, PlayerAvatar_SecretBaseMatSpinStep1, @@ -311,23 +311,23 @@ static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct Eve void MovementType_Player(struct Sprite *sprite) { - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_NoMovement2); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, ObjectEventCB2_NoMovement2); } -static u8 EventObjectCB2_NoMovement2(void) +static u8 ObjectEventCB2_NoMovement2(void) { return 0; } void player_step(u8 direction, u16 newKeys, u16 heldKeys) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; sub_808C280(playerEventObj); if (gPlayerAvatar.preventStep == FALSE) { Bike_TryAcroBikeHistoryUpdate(newKeys, heldKeys); - if (TryInterruptEventObjectSpecialAnim(playerEventObj, direction) == 0) + if (TryInterruptObjectEventSpecialAnim(playerEventObj, direction) == 0) { npc_clear_strange_bits(playerEventObj); DoPlayerAvatarTransition(); @@ -340,16 +340,16 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys) } } -static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventObj, u8 direction) +static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerEventObj, u8 direction) { u8 r5 = direction; u8 r6 = direction; r6++; r6--; - if (EventObjectIsMovementOverridden(playerEventObj) - && !EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerEventObj) + && !ObjectEventClearHeldMovementIfFinished(playerEventObj)) { - u8 heldMovementActionId = EventObjectGetHeldMovementActionId(playerEventObj); + u8 heldMovementActionId = ObjectEventGetHeldMovementActionId(playerEventObj); if (heldMovementActionId > MOVEMENT_ACTION_WALK_FAST_RIGHT && heldMovementActionId < MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN) { if (direction == DIR_NONE) @@ -359,13 +359,13 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO if (playerEventObj->movementDirection != r5) { - EventObjectClearHeldMovement(playerEventObj); + ObjectEventClearHeldMovement(playerEventObj); return FALSE; } if (!sub_808B028(r6)) { - EventObjectClearHeldMovement(playerEventObj); + ObjectEventClearHeldMovement(playerEventObj); return FALSE; } } @@ -376,11 +376,11 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO return FALSE; } -static void npc_clear_strange_bits(struct EventObject *eventObj) +static void npc_clear_strange_bits(struct ObjectEvent *objEvent) { - eventObj->inanimate = 0; - eventObj->disableAnim = 0; - eventObj->facingDirectionLocked = 0; + objEvent->inanimate = 0; + objEvent->disableAnim = 0; + objEvent->facingDirectionLocked = 0; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH; } @@ -410,7 +410,7 @@ static u8 GetForcedMovementByMetatileBehavior(void) if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_5)) { - u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior; + u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior; for (i = 0; i < 18; i++) { @@ -425,11 +425,11 @@ static bool8 ForcedMovement_None(void) { if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; playerEventObj->facingDirectionLocked = 0; playerEventObj->enableAnim = 1; - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection); gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_6; } return FALSE; @@ -467,7 +467,7 @@ static u8 DoForcedMovement(u8 direction, void (*b)(u8)) static u8 DoForcedMovementInCurrentDirection(void (*a)(u8)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; playerEventObj->disableAnim = 1; return DoForcedMovement(playerEventObj->movementDirection, a); @@ -520,7 +520,7 @@ static bool8 ForcedMovement_PushedEastByCurrent(void) u8 ForcedMovement_Slide(u8 direction, void (*b)(u8)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; playerEventObj->disableAnim = 1; playerEventObj->facingDirectionLocked = 1; @@ -561,7 +561,7 @@ static bool8 ForcedMovement_0xBC(void) static bool8 ForcedMovement_MuddySlope(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (playerEventObj->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3) { @@ -642,7 +642,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) } if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_UNDERWATER) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH) - && IsRunningDisallowed(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) == 0) + && IsRunningDisallowed(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) == 0) { PlayerRun(direction); gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH; @@ -657,18 +657,18 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) static u8 CheckForPlayerAvatarCollision(u8 direction) { s16 x, y; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; x = playerEventObj->currentCoords.x; y = playerEventObj->currentCoords.y; MoveCoords(direction, &x, &y); - return CheckForEventObjectCollision(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); + return CheckForObjectEventCollision(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); } static u8 sub_808B028(u8 direction) { s16 x, y; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; x = playerEventObj->currentCoords.x; y = playerEventObj->currentCoords.y; @@ -676,9 +676,9 @@ static u8 sub_808B028(u8 direction) return sub_808B164(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); } -u8 CheckForEventObjectCollision(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatileBehavior) +u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior) { - u8 collision = GetCollisionAtCoords(eventObject, x, y, direction); + u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction); if (collision == COLLISION_ELEVATION_MISMATCH && CanStopSurfing(x, y, direction)) return COLLISION_STOP_SURFING; @@ -699,9 +699,9 @@ u8 CheckForEventObjectCollision(struct EventObject *eventObject, s16 x, s16 y, u return collision; } -static u8 sub_808B164(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatileBehavior) +static u8 sub_808B164(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior) { - u8 collision = GetCollisionAtCoords(eventObject, x, y, direction); + u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction); if (collision == COLLISION_NONE) { @@ -716,7 +716,7 @@ static bool8 CanStopSurfing(s16 x, s16 y, u8 direction) { if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) && MapGridGetZCoordAt(x, y) == 3 - && GetEventObjectIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT) + && GetObjectEventIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT) { CreateStopSurfingTask(direction); return TRUE; @@ -739,17 +739,17 @@ static bool8 TryPushBoulder(s16 x, s16 y, u8 direction) { if (FlagGet(FLAG_SYS_USE_STRENGTH)) { - u8 eventObjectId = GetEventObjectIdByXY(x, y); + u8 objectEventId = GetObjectEventIdByXY(x, y); - if (eventObjectId != 16 && gEventObjects[eventObjectId].graphicsId == EVENT_OBJ_GFX_PUSHABLE_BOULDER) + if (objectEventId != 16 && gObjectEvents[objectEventId].graphicsId == EVENT_OBJ_GFX_PUSHABLE_BOULDER) { - x = gEventObjects[eventObjectId].currentCoords.x; - y = gEventObjects[eventObjectId].currentCoords.y; + x = gObjectEvents[objectEventId].currentCoords.x; + y = gObjectEvents[objectEventId].currentCoords.y; MoveCoords(direction, &x, &y); - if (GetCollisionAtCoords(&gEventObjects[eventObjectId], x, y, direction) == COLLISION_NONE + if (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == COLLISION_NONE && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0) { - StartStrengthAnim(eventObjectId, direction); + StartStrengthAnim(objectEventId, direction); return TRUE; } } @@ -774,21 +774,21 @@ static void CheckAcroBikeCollision(s16 x, s16 y, u8 metatileBehavior, u8 *collis bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction) { u8 mewObjectId; - struct EventObject *object; + struct ObjectEvent *object; s16 playerX; s16 playerY; s16 mewPrevX; - object = &gEventObjects[gPlayerAvatar.eventObjectId]; + object = &gObjectEvents[gPlayerAvatar.objectEventId]; playerX = object->currentCoords.x; playerY = object->currentCoords.y; MoveCoords(direction, &playerX, &playerY); - mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); + mewObjectId = GetObjectEventIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); if (mewObjectId == EVENT_OBJECTS_COUNT) return FALSE; - object = &gEventObjects[mewObjectId]; + object = &gObjectEvents[mewObjectId]; mewPrevX = object->previousCoords.x; if (mewPrevX == playerX) @@ -821,65 +821,65 @@ static void DoPlayerAvatarTransition(void) for (i = 0; i < 8; i++, flags >>= 1) { if (flags & 1) - gUnknown_084974B8[i](&gEventObjects[gPlayerAvatar.eventObjectId]); + gUnknown_084974B8[i](&gObjectEvents[gPlayerAvatar.objectEventId]); } gPlayerAvatar.unk1 = 0; } } -static void PlayerAvatarTransition_Dummy(struct EventObject *eventObj) +static void PlayerAvatarTransition_Dummy(struct ObjectEvent *objEvent) { } -static void PlayerAvatarTransition_Normal(struct EventObject *eventObj) +static void PlayerAvatarTransition_Normal(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); } -static void PlayerAvatarTransition_MachBike(struct EventObject *eventObj) +static void PlayerAvatarTransition_MachBike(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); BikeClearState(0, 0); } -static void PlayerAvatarTransition_AcroBike(struct EventObject *eventObj) +static void PlayerAvatarTransition_AcroBike(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ACRO_BIKE); BikeClearState(0, 0); Bike_HandleBumpySlopeJump(); } -static void PlayerAvatarTransition_Surfing(struct EventObject *eventObj) +static void PlayerAvatarTransition_Surfing(struct ObjectEvent *objEvent) { u8 spriteId; - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING); - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; spriteId = FieldEffectStart(FLDEFF_SURF_BLOB); - eventObj->fieldEffectSpriteId = spriteId; + objEvent->fieldEffectSpriteId = spriteId; sub_81555AC(spriteId, 1); } -static void PlayerAvatarTransition_Underwater(struct EventObject *eventObj) +static void PlayerAvatarTransition_Underwater(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_UNDERWATER); - eventObj->fieldEffectSpriteId = sub_8155800(eventObj->spriteId); + objEvent->fieldEffectSpriteId = sub_8155800(objEvent->spriteId); } -static void PlayerAvatarTransition_ReturnToField(struct EventObject *eventObj) +static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *objEvent) { gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5; } @@ -904,7 +904,7 @@ void sub_808B578(void) static bool8 player_is_anim_in_certain_ranges(void) { - u8 movementActionId = gEventObjects[gPlayerAvatar.eventObjectId].movementActionId; + u8 movementActionId = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId; if (movementActionId <= MOVEMENT_ACTION_FACE_RIGHT || (movementActionId >= MOVEMENT_ACTION_DELAY_1 && movementActionId <= MOVEMENT_ACTION_DELAY_16) @@ -926,27 +926,27 @@ static bool8 sub_808B618(void) static bool8 PlayerIsAnimActive(void) { - return EventObjectIsMovementOverridden(&gEventObjects[gPlayerAvatar.eventObjectId]); + return ObjectEventIsMovementOverridden(&gObjectEvents[gPlayerAvatar.objectEventId]); } static bool8 PlayerCheckIfAnimFinishedOrInactive(void) { - return EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]); + return ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]); } static void PlayerSetCopyableMovement(u8 a) { - gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement = a; + gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement = a; } u8 PlayerGetCopyableMovement(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement; + return gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement; } static void sub_808B6BC(u8 a) { - EventObjectForceSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], a); + ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], a); } void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) @@ -954,7 +954,7 @@ void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) if (!PlayerIsAnimActive()) { PlayerSetCopyableMovement(copyableMovement); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], movementActionId); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementActionId); } } @@ -1029,7 +1029,7 @@ void sub_808B864(void) if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING) { if (player_should_look_direction_be_enforced_upon_movement()) - sub_808B6BC(GetFaceDirectionMovementAction(gEventObjects[gPlayerAvatar.eventObjectId].facingDirection)); + sub_808B6BC(GetFaceDirectionMovementAction(gObjectEvents[gPlayerAvatar.objectEventId].facingDirection)); } } @@ -1103,7 +1103,7 @@ void sub_808B9D4(u8 direction) static void PlayCollisionSoundIfNotFacingWarp(u8 a) { s16 x, y; - u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior; + u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior; if (!sArrowWarpMetatileBehaviorChecks[a - 1](metatileBehavior)) { @@ -1120,20 +1120,20 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a) void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y) { - *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; MoveCoords(GetPlayerFacingDirection(), x, y); } void PlayerGetDestCoords(s16 *x, s16 *y) { - *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; } u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y) { - struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2]) { @@ -1168,22 +1168,22 @@ u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y) u8 GetPlayerFacingDirection(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].facingDirection; + return gObjectEvents[gPlayerAvatar.objectEventId].facingDirection; } u8 GetPlayerMovementDirection(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].movementDirection; + return gObjectEvents[gPlayerAvatar.objectEventId].movementDirection; } u8 PlayerGetZCoord(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].previousElevation; + return gObjectEvents[gPlayerAvatar.objectEventId].previousElevation; } void sub_808BC90(s16 x, s16 y) { - MoveEventObjectToMapCoords(&gEventObjects[gPlayerAvatar.eventObjectId], x, y); + MoveObjectEventToMapCoords(&gObjectEvents[gPlayerAvatar.objectEventId], x, y); } u8 TestPlayerAvatarFlags(u8 a) @@ -1208,10 +1208,10 @@ void sub_808BCE8(void) void sub_808BCF4(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; npc_clear_strange_bits(playerEventObj); - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection); if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) { Bike_HandleBumpySlopeJump(); @@ -1307,7 +1307,7 @@ bool8 IsPlayerSurfingNorth(void) bool8 IsPlayerFacingSurfableFishableWater(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; s16 x = playerEventObj->currentCoords.x; s16 y = playerEventObj->currentCoords.y; @@ -1366,9 +1366,9 @@ void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b) void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) { - struct EventObjectTemplate playerEventObjTemplate; - u8 eventObjectId; - struct EventObject *eventObject; + struct ObjectEventTemplate playerEventObjTemplate; + u8 objectEventId; + struct ObjectEvent *objectEvent; playerEventObjTemplate.localId = EVENT_OBJ_ID_PLAYER; playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); @@ -1382,71 +1382,71 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) playerEventObjTemplate.trainerRange_berryTreeId = 0; playerEventObjTemplate.script = NULL; playerEventObjTemplate.flagId = 0; - eventObjectId = SpawnSpecialEventObject(&playerEventObjTemplate); - eventObject = &gEventObjects[eventObjectId]; - eventObject->isPlayer = 1; - eventObject->warpArrowSpriteId = CreateWarpArrowSprite(); - EventObjectTurn(eventObject, direction); + objectEventId = SpawnSpecialObjectEvent(&playerEventObjTemplate); + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->isPlayer = 1; + objectEvent->warpArrowSpriteId = CreateWarpArrowSprite(); + ObjectEventTurn(objectEvent, direction); ClearPlayerAvatarInfo(); gPlayerAvatar.runningState = NOT_MOVING; gPlayerAvatar.tileTransitionState = T_NOT_MOVING; - gPlayerAvatar.eventObjectId = eventObjectId; - gPlayerAvatar.spriteId = eventObject->spriteId; + gPlayerAvatar.objectEventId = objectEventId; + gPlayerAvatar.spriteId = objectEvent->spriteId; gPlayerAvatar.gender = gender; SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_5 | PLAYER_AVATAR_FLAG_ON_FOOT); } void sub_808C0A8(u8 a) { - gEventObjects[gPlayerAvatar.eventObjectId].invisible = a; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = a; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - gSprites[gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId].invisible = a; + gSprites[gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId].invisible = a; } void sub_808C114(void) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0); } void sub_808C15C(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction)); } void sub_808C1B4(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction)); SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1); } void sub_808C228(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionAnimNum(direction)); } -static void sub_808C280(struct EventObject *eventObject) +static void sub_808C280(struct ObjectEvent *objectEvent) { s16 x; s16 y; u8 direction; - u8 metatileBehavior = eventObject->currentMetatileBehavior; + u8 metatileBehavior = objectEvent->currentMetatileBehavior; for (x = 0, direction = DIR_SOUTH; x < 4; x++, direction++) { - if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == eventObject->movementDirection) + if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == objectEvent->movementDirection) { - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoords(direction, &x, &y); - ShowWarpArrowSprite(eventObject->warpArrowSpriteId, direction, x, y); + ShowWarpArrowSprite(objectEvent->warpArrowSpriteId, direction, x, y); return; } } - SetSpriteInvisible(eventObject->warpArrowSpriteId); + SetSpriteInvisible(objectEvent->warpArrowSpriteId); } /* Strength */ @@ -1463,12 +1463,12 @@ static void StartStrengthAnim(u8 a, u8 b) static void Task_BumpBoulder(u8 taskId) { while (gUnknown_08497530[gTasks[taskId].data[0]](&gTasks[taskId], - &gEventObjects[gPlayerAvatar.eventObjectId], - &gEventObjects[gTasks[taskId].data[1]])) + &gObjectEvents[gPlayerAvatar.objectEventId], + &gObjectEvents[gTasks[taskId].data[1]])) ; } -static bool8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1476,25 +1476,25 @@ static bool8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, st return FALSE; } -static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { - if (EventObjectIsHeldMovementActive(playerObject)) + if (ObjectEventIsHeldMovementActive(playerObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(playerObject); } - if (EventObjectIsHeldMovementActive(strengthObject)) + if (ObjectEventIsHeldMovementActive(strengthObject)) { - EventObjectClearHeldMovementIfFinished(strengthObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); } - if (!EventObjectIsMovementOverridden(playerObject) - && !EventObjectIsMovementOverridden(strengthObject)) + if (!ObjectEventIsMovementOverridden(playerObject) + && !ObjectEventIsMovementOverridden(strengthObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); - EventObjectClearHeldMovementIfFinished(strengthObject); - EventObjectSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2])); - EventObjectSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2])); + ObjectEventClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); + ObjectEventSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2])); + ObjectEventSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2])); gFieldEffectArguments[0] = strengthObject->currentCoords.x; gFieldEffectArguments[1] = strengthObject->currentCoords.y; gFieldEffectArguments[2] = strengthObject->previousElevation; @@ -1506,13 +1506,13 @@ static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject return FALSE; } -static bool8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { - if (EventObjectCheckHeldMovementStatus(playerObject) - && EventObjectCheckHeldMovementStatus(strengthObject)) + if (ObjectEventCheckHeldMovementStatus(playerObject) + && ObjectEventCheckHeldMovementStatus(strengthObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); - EventObjectClearHeldMovementIfFinished(strengthObject); + ObjectEventClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); DestroyTask(FindTaskIdByFunc(Task_BumpBoulder)); @@ -1529,18 +1529,18 @@ static void DoPlayerMatJump(void) static void DoPlayerAvatarSecretBaseMatJump(u8 taskId) { - while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])) + while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])) ; } // because data[0] is used to call this, it can be inferred that there may have been multiple mat jump functions at one point, so the name for these groups of functions is appropriate in assuming the sole use of mat jump. -static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject) +static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent) { gPlayerAvatar.preventStep = TRUE; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { PlaySE(SE_DANSA); - EventObjectSetHeldMovement(eventObject, GetJumpInPlaceMovementAction(eventObject->facingDirection)); + ObjectEventSetHeldMovement(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection)); task->data[1]++; if (task->data[1] > 1) { @@ -1563,29 +1563,29 @@ static void DoPlayerMatSpin(void) static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId) { - while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])) + while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])) ; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent) { task->data[0]++; - task->data[1] = eventObject->movementDirection; + task->data[1] = objectEvent->movementDirection; gPlayerAvatar.preventStep = TRUE; ScriptContext2_Enable(); PlaySE(SE_TK_WARPIN); return TRUE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent) { u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { u8 direction; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(direction = directions[eventObject->movementDirection - 1])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(direction = directions[objectEvent->movementDirection - 1])); if (direction == (u8)task->data[1]) task->data[2]++; task->data[0]++; @@ -1595,7 +1595,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct Event return FALSE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent) { const u8 actions[] = { MOVEMENT_ACTION_DELAY_1, @@ -1605,19 +1605,19 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct Event MOVEMENT_ACTION_DELAY_8, }; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, actions[task->data[2]]); + ObjectEventSetHeldMovement(objectEvent, actions[task->data[2]]); task->data[0] = 1; } return FALSE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1]))); + ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1]))); ScriptContext2_Disable(); gPlayerAvatar.preventStep = FALSE; DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin)); @@ -1642,26 +1642,26 @@ static void CreateStopSurfingTask(u8 direction) static void Task_StopSurfingInit(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectIsMovementOverridden(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerEventObj)) { - if (!EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (!ObjectEventClearHeldMovementIfFinished(playerEventObj)) return; } sub_81555AC(playerEventObj->fieldEffectSpriteId, 2); - EventObjectSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); + ObjectEventSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); gTasks[taskId].func = Task_WaitStopSurfing; } static void Task_WaitStopSurfing(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventClearHeldMovementIfFinished(playerEventObj)) { - EventObjectSetGraphicsId(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); - EventObjectSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection)); + ObjectEventSetGraphicsId(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + ObjectEventSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection)); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); DestroySprite(&gSprites[playerEventObj->fieldEffectSpriteId]); @@ -1729,15 +1729,15 @@ static bool8 Fishing1(struct Task *task) static bool8 Fishing2(struct Task *task) { - struct EventObject *playerEventObj; + struct ObjectEvent *playerEventObj; const s16 arr1[] = {1, 1, 1}; const s16 arr2[] = {1, 3, 6}; task->tRoundsPlayed = 0; task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]); - task->tPlayerGfxId = gEventObjects[gPlayerAvatar.eventObjectId].graphicsId; - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectClearHeldMovementIfActive(playerEventObj); + task->tPlayerGfxId = gObjectEvents[gPlayerAvatar.objectEventId].graphicsId; + playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(playerEventObj); playerEventObj->enableAnim = 1; sub_808C15C(playerEventObj->facingDirection); task->tStep++; @@ -1928,12 +1928,12 @@ static bool8 Fishing11(struct Task *task) { if (!IsTextPrinterActive(0)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId); - EventObjectTurn(playerEventObj, playerEventObj->movementDirection); + ObjectEventSetGraphicsId(playerEventObj, task->tPlayerGfxId); + ObjectEventTurn(playerEventObj, playerEventObj->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); + sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; ClearDialogWindowAndFrame(0, TRUE); @@ -1988,12 +1988,12 @@ static bool8 Fishing15(struct Task *task) AlignFishingAnimationFrames(); if (gSprites[gPlayerAvatar.spriteId].animEnded) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId); - EventObjectTurn(playerEventObj, playerEventObj->movementDirection); + ObjectEventSetGraphicsId(playerEventObj, task->tPlayerGfxId); + ObjectEventTurn(playerEventObj, playerEventObj->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); + sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; task->tStep++; @@ -2008,7 +2008,7 @@ static bool8 Fishing16(struct Task *task) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ClearDialogWindowAndFrame(0, TRUE); sub_80ED950(0); DestroyTask(FindTaskIdByFunc(Task_Fishing)); @@ -2052,7 +2052,7 @@ static void AlignFishingAnimationFrames(void) if (animType == 10 || animType == 11) playerSprite->pos2.y = 8; if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 1, playerSprite->pos2.y); + sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y); } void sub_808D074(u8 a0) @@ -2071,14 +2071,14 @@ static u8 sub_808D080(void) static void sub_808D094(u8 taskId) { - struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[object->spriteId]; s16 *data = gTasks[taskId].data; switch (data[0]) { case 0: - if (!EventObjectClearHeldMovementIfFinished(object)) + if (!ObjectEventClearHeldMovementIfFinished(object)) { return; } @@ -2136,7 +2136,7 @@ static const u8 gUnknown_084975BC[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, static void sub_808D1FC(u8 taskId) { - struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[object->spriteId]; s16 *data = gTasks[taskId].data; @@ -2144,7 +2144,7 @@ static void sub_808D1FC(u8 taskId) { case 0: data[5] = sub_808D080(); - EventObjectForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[data[5]])); + ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[data[5]])); data[1] = 0; data[2] = 116; data[4] = sprite->pos1.y; @@ -2195,19 +2195,19 @@ static void sub_808D1FC(u8 taskId) } } -static u8 sub_808D38C(struct EventObject *object, s16 *a1) +static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1) { if (*a1 < 8 && ++(*a1) < 8) { return object->facingDirection; } - if (!EventObjectCheckHeldMovementStatus(object)) + if (!ObjectEventCheckHeldMovementStatus(object)) { return object->facingDirection; } - EventObjectForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[object->facingDirection])); + ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[object->facingDirection])); *a1 = 0; return gUnknown_084975BC[object->facingDirection]; } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 076859c285..05922e98cd 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -327,7 +327,7 @@ static void sub_80AF438(u8 taskId) { case 0: sub_80AF0F4(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); FieldSetDoorOpened(*x, *y); task->data[0] = 1; @@ -335,27 +335,27 @@ static void sub_80AF438(u8 taskId) case 1: if (WaitForWeatherFadeIn()) { - u8 eventObjId; + u8 objEventId; sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - u8 eventObjId; + u8 objEventId; task->data[1] = FieldAnimateDoorClose(*x, *y); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); task->data[0] = 3; } break; case 3: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); task->data[0] = 4; } break; @@ -376,24 +376,24 @@ static void task_map_chg_seq_0807E20C(u8 taskId) { case 0: sub_80AF0F4(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); task->data[0] = 1; break; case 1: if (WaitForWeatherFadeIn()) { - u8 eventObjId; + u8 objEventId; sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); task->data[0] = 3; } break; @@ -409,14 +409,14 @@ static void task_map_chg_seq_0807E2CC(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); gTasks[taskId].data[0]++; break; case 1: if (WaitForWeatherFadeIn()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -452,7 +452,7 @@ static void task_mpl_807E3C8(u8 taskId) { ScriptContext2_Disable(); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); } } @@ -560,7 +560,7 @@ void DoMossdeepGymWarp(void) { sub_8085540(1); ScriptContext2_Enable(); - SaveEventObjects(); + SaveObjectEvents(); TryFadeOutOldMapMusic(); WarpFadeScreen(); PlaySE(SE_TK_WARPIN); @@ -650,7 +650,7 @@ static void sub_80AFA0C(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -683,7 +683,7 @@ static void sub_80AFA88(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); PlaySE(GetDoorSoundEffect(*x, *y - 1)); task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); @@ -692,21 +692,21 @@ static void sub_80AFA88(u8 taskId) case 1: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - u8 eventObjId; - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); + u8 objEventId; + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[objEventId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_UP); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - u8 eventObjId; + u8 objEventId; task->data[1] = FieldAnimateDoorClose(*x, *y - 1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); sub_80AF0F4(0); task->data[0] = 3; } @@ -734,7 +734,7 @@ static void task0A_fade_n_map_maybe(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -1001,7 +1001,7 @@ static void task0A_mpl_807E31C(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); sub_808D194(); gTasks[taskId].data[0]++; @@ -1009,7 +1009,7 @@ static void task0A_mpl_807E31C(u8 taskId) case 1: if (WaitForWeatherFadeIn() && sub_808D1B4() != TRUE) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -1024,7 +1024,7 @@ static void sub_80B01BC(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); PlaySE(SE_TK_WARPIN); sub_808D1C8(); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 439b1855a5..7e092d7484 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -326,7 +326,7 @@ void Task_HandlePorthole(u8 taskId) static void ShowSSTidalWhileSailing(void) { - u8 spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); + u8 spriteId = AddPseudoObjectEvent(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); gSprites[spriteId].coordOffsetEnabled = FALSE; @@ -339,7 +339,7 @@ static void ShowSSTidalWhileSailing(void) void sub_80FB768(void) { ShowSSTidalWhileSailing(); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; pal_fill_black(); CreateTask(Task_HandlePorthole, 80); ScriptContext2_Enable(); diff --git a/src/field_specials.c b/src/field_specials.c index 830c2246d8..37479b111f 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -87,17 +87,17 @@ static EWRAM_DATA u32 sUnknown_0203AB70 = 0; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; -extern const u16 gEventObjectPalette8[]; -extern const u16 gEventObjectPalette17[]; -extern const u16 gEventObjectPalette33[]; -extern const u16 gEventObjectPalette34[]; +extern const u16 gObjectEventPalette8[]; +extern const u16 gObjectEventPalette17[]; +extern const u16 gObjectEventPalette33[]; +extern const u16 gObjectEventPalette34[]; void TryLoseFansFromPlayTime(void); void SetPlayerGotFirstFans(void); u16 GetNumFansOfPlayerInTrainerFanClub(void); static void RecordCyclingRoadResults(u32, u8); -static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); +static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId); static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId); static void Task_PCTurnOnEffect(u8); @@ -521,7 +521,7 @@ u8 GetLinkPartnerNames(void) return nLinkPlayers; } -void SpawnLinkPartnerEventObject(void) +void SpawnLinkPartnerObjectEvent(void) { u8 j = 0; s16 x = 0; @@ -592,8 +592,8 @@ void SpawnLinkPartnerEventObject(void) linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL; break; } - SpawnSpecialEventObjectParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); - LoadLinkPartnerEventObjectSpritePalette(linkSpriteId, 240 - i, i); + SpawnSpecialObjectEventParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); + LoadLinkPartnerObjectEventSpritePalette(linkSpriteId, 240 - i, i); j++; if (j == MAX_LINK_PLAYERS) { @@ -603,7 +603,7 @@ void SpawnLinkPartnerEventObject(void) } } -static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum) +static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum) { u8 adjustedPaletteNum; // Note: This temp var is necessary; paletteNum += 6 doesn't match. @@ -613,26 +613,26 @@ static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEvent graphicsId == EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL || graphicsId == EVENT_OBJ_GFX_RIVAL_MAY_NORMAL) { - u8 obj = GetEventObjectIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + u8 obj = GetObjectEventIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); if (obj != EVENT_OBJECTS_COUNT) { - u8 spriteId = gEventObjects[obj].spriteId; + u8 spriteId = gObjectEvents[obj].spriteId; struct Sprite *sprite = &gSprites[spriteId]; sprite->oam.paletteNum = adjustedPaletteNum; switch (graphicsId) { case EVENT_OBJ_GFX_LINK_RS_BRENDAN: - LoadPalette(gEventObjectPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); break; case EVENT_OBJ_GFX_LINK_RS_MAY: - LoadPalette(gEventObjectPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); break; case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL: - LoadPalette(gEventObjectPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); break; case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL: - LoadPalette(gEventObjectPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); break; } } @@ -1304,15 +1304,15 @@ void IsGrassTypeInParty(void) void SpawnCameraObject(void) { - u8 obj = SpawnSpecialEventObjectParameterized(EVENT_OBJ_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); - gEventObjects[obj].invisible = TRUE; - CameraObjectSetFollowedObjectId(gEventObjects[obj].spriteId); + u8 obj = SpawnSpecialObjectEventParameterized(EVENT_OBJ_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); + gObjectEvents[obj].invisible = TRUE; + CameraObjectSetFollowedObjectId(gObjectEvents[obj].spriteId); } void RemoveCameraObject(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveEventObjectByLocalIdAndMap(EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } u8 GetPokeblockNameByMonNature(void) @@ -1585,9 +1585,9 @@ u16 ScriptGetPartyMonSpecies(void) } // Removed for Emerald -void TryInitBattleTowerAwardManEventObject(void) +void TryInitBattleTowerAwardManObjectEvent(void) { - //TryInitLocalEventObject(6); + //TryInitLocalObjectEvent(6); } u16 GetDaysUntilPacifidlogTMAvailable(void) @@ -3433,9 +3433,9 @@ static void Task_DeoxysRockInteraction(u8 taskId) static void ChangeDeoxysRockLevel(u8 rockLevel) { - u8 eventObjectId; + u8 objectEventId; LoadPalette(&sDeoxysRockPalettes[rockLevel], 0x1A0, 8); - TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); if (rockLevel == 0) PlaySE(SE_W109); diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index fe21ff060b..f0d4e46b35 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -580,7 +580,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite) FieldEffectStop(&gSprites[sCutGrassSpriteArrayPtr[0]], FLDEFF_CUT_GRASS); FREE_AND_SET_NULL(sCutGrassSpriteArrayPtr); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); if (IsMewPlayingHideAndSeek() == TRUE) diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 591f61eb70..8bb10685e9 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -317,7 +317,7 @@ static const struct SpriteTemplate gUnknown_0858E880 = { .tileTag = 0xFFFF, .paletteTag = 0x1000, - .oam = &gEventObjectBaseOam_32x8, + .oam = &gObjectEventBaseOam_32x8, .anims = gSpriteAnimTable_858E87C, .images = gUnknown_0858E84C, .affineAnims = gDummySpriteAffineAnimTable, @@ -1002,8 +1002,8 @@ static void SpriteCB_GlitterMatSparkle(struct Sprite *sprite) void DoSecretBaseGlitterMatSparkle(void) { - s16 x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - s16 y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + s16 x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + s16 y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; u8 spriteId; sub_80930E0(&x, &y, 8, 4); @@ -1229,27 +1229,27 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!EventObjectIsMovementOverridden(playerEventObj) - || EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (!ObjectEventIsMovementOverridden(playerEventObj) + || ObjectEventClearHeldMovementIfFinished(playerEventObj)) { sub_808C228(GetPlayerFacingDirection()); - EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); gTasks[taskId].func = Task_WateringBerryTreeAnim_2; } } static void Task_WateringBerryTreeAnim_2(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventClearHeldMovementIfFinished(playerEventObj)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) - EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); else gTasks[taskId].func = Task_WateringBerryTreeAnim_3; diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 18cebdf112..cf806b55ee 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -30,18 +30,18 @@ static void sub_8135714(void); // text bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) { - u8 eventObjId; + u8 objEventId; GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); gPlayerFacingPosition.height = PlayerGetZCoord(); - eventObjId = GetEventObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); - if (gEventObjects[eventObjId].graphicsId != graphicsId) + objEventId = GetObjectEventIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); + if (gObjectEvents[objEventId].graphicsId != graphicsId) { return FALSE; } else { - gSpecialVar_LastTalked = gEventObjects[eventObjId].localId; + gSpecialVar_LastTalked = gObjectEvents[objEventId].localId; return TRUE; } } @@ -54,13 +54,13 @@ u8 oei_task_add(void) static void task08_080C9820(u8 taskId) { - u8 eventObjId; + u8 objEventId; ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; - eventObjId = gPlayerAvatar.eventObjectId; - if (!EventObjectIsMovementOverridden(&gEventObjects[eventObjId]) - || EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) + objEventId = gPlayerAvatar.objectEventId; + if (!ObjectEventIsMovementOverridden(&gObjectEvents[objEventId]) + || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId) else { sub_808C114(); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); gTasks[taskId].func = sub_813552C; } } @@ -78,7 +78,7 @@ static void task08_080C9820(u8 taskId) static void sub_813552C(u8 taskId) { - if (EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_8135578; @@ -98,7 +98,7 @@ static void sub_8135578(u8 taskId) gFieldEffectArguments[2] = 2; if (gFieldEffectArguments[1] == 4) gFieldEffectArguments[2] = 3; - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_813561C; diff --git a/src/frontier_util.c b/src/frontier_util.c index baf830af99..032bce198c 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -71,7 +71,7 @@ static void sub_81A43A8(void); static void sub_81A4410(void); static void BufferFrontierTrainerName(void); static void sub_81A447C(void); -static void SetFacilityBrainEventObject(void); +static void SetFacilityBrainObjectEvent(void); static void ShowTowerResultsWindow(u8); static void ShowDomeResultsWindow(u8); static void ShowPalaceResultsWindow(u8); @@ -626,7 +626,7 @@ static void (* const sFrontierUtilFuncs[])(void) = [FRONTIER_UTIL_FUNC_19] = sub_81A4410, [FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME] = BufferFrontierTrainerName, [FRONTIER_UTIL_FUNC_21] = sub_81A447C, - [FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT] = SetFacilityBrainEventObject, + [FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT] = SetFacilityBrainObjectEvent, }; static const struct WindowTemplate gUnknown_08611C74 = @@ -2199,7 +2199,7 @@ static void sub_81A447C(void) } } -static void SetFacilityBrainEventObject(void) +static void SetFacilityBrainObjectEvent(void) { SetFrontierBrainEventObjGfx(VarGet(VAR_FRONTIER_FACILITY)); } diff --git a/src/item_menu.c b/src/item_menu.c index 40a0f0439f..9d8010f85f 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1891,7 +1891,7 @@ bool8 UseRegisteredKeyItemOnField(void) if (CheckBagHasItem(gSaveBlock1Ptr->registeredItem, 1) == TRUE) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem; diff --git a/src/item_use.c b/src/item_use.c index a777bb2ec9..e0917b8099 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -176,7 +176,7 @@ void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId) { ClearDialogWindowAndFrame(0, 1); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } @@ -231,7 +231,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId) GetOnOffBike(2); else GetOnOffBike(4); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -337,7 +337,7 @@ void sub_80FD504(u8 taskId) void sub_80FD5CC(u8 taskId) { ClearDialogWindowAndFrame(0, 1); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -558,15 +558,15 @@ u8 sub_80FD9B0(s16 itemX, s16 itemY) void sub_80FDA24(u8 direction) { - EventObjectClearHeldMovementIfFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); - EventObjectClearHeldMovement(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); - UnfreezeEventObject(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); + UnfreezeObjectEvent(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); PlayerTurnInPlace(direction); } void sub_80FDA94(u8 taskId) { - if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE) DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC); } @@ -574,7 +574,7 @@ void sub_80FDADC(u8 taskId) { s16 *data = gTasks[taskId].data; - if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE || data[2] == FALSE) { sub_80FDA24(gUnknown_085920E4[data[5]]); @@ -706,8 +706,8 @@ bool8 TryToWaterSudowoodo(void) u8 objId; GetXYCoordsOneStepInFrontOfPlayer(&x, &y); z = PlayerGetZCoord(); - objId = GetEventObjectIdByXYZ(x, y, z); - if (objId == EVENT_OBJECTS_COUNT || gEventObjects[objId].graphicsId != EVENT_OBJ_GFX_SUDOWOODO) + objId = GetObjectEventIdByXYZ(x, y, z); + if (objId == EVENT_OBJECTS_COUNT || gObjectEvents[objId].graphicsId != EVENT_OBJ_GFX_SUDOWOODO) return FALSE; else return TRUE; diff --git a/src/load_save.c b/src/load_save.c index 24dfda20cb..5b02e4cc54 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -181,32 +181,32 @@ void LoadPlayerParty(void) gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i]; } -void SaveEventObjects(void) +void SaveObjectEvents(void) { int i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - gSaveBlock1Ptr->eventObjects[i] = gEventObjects[i]; + gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i]; } -void LoadEventObjects(void) +void LoadObjectEvents(void) { int i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - gEventObjects[i] = gSaveBlock1Ptr->eventObjects[i]; + gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i]; } void SaveSerializedGame(void) { SavePlayerParty(); - SaveEventObjects(); + SaveObjectEvents(); } void LoadSerializedGame(void) { LoadPlayerParty(); - LoadEventObjects(); + LoadObjectEvents(); } void LoadPlayerBag(void) diff --git a/src/match_call.c b/src/match_call.c index 646b14cea7..1fc5520d95 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1114,7 +1114,7 @@ static void StartMatchCall(void) if (!gMatchCallState.triggeredFromScript) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); } @@ -1288,10 +1288,10 @@ static bool32 sub_81963F0(u8 taskId) if (!gMatchCallState.triggeredFromScript) { sub_81973A4(); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); } diff --git a/src/mevent_client.c b/src/mevent_client.c index 659b772df4..9a62bf18ed 100644 --- a/src/mevent_client.c +++ b/src/mevent_client.c @@ -216,7 +216,7 @@ static u32 mainseq_4(struct mevent_client * svr) sub_801B508(svr->recvBuffer); break; case 17: - InitRamScript_NoEventObject(svr->recvBuffer, 1000); + InitRamScript_NoObjectEvent(svr->recvBuffer, 1000); break; case 18: memcpy(&gSaveBlock2Ptr->frontier.ereaderTrainer, svr->recvBuffer, 0xbc); diff --git a/src/mirage_tower.c b/src/mirage_tower.c index 0c2b8ce744..66a7990052 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -346,16 +346,16 @@ void StartPlayerDescendMirageTower(void) static void PlayerDescendMirageTower(u8 taskId) { - u8 eventObjectId; - struct EventObject *fakePlayerEventObject; - struct EventObject *playerEventObject; + u8 objectEventId; + struct ObjectEvent *fakePlayerObjectEvent; + struct ObjectEvent *playerObjectEvent; - TryGetEventObjectIdByLocalIdAndMap(45, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); - fakePlayerEventObject = &gEventObjects[eventObjectId]; - gSprites[fakePlayerEventObject->spriteId].pos2.y += 4; - playerEventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((gSprites[fakePlayerEventObject->spriteId].pos1.y + gSprites[fakePlayerEventObject->spriteId].pos2.y) >= - (gSprites[playerEventObject->spriteId].pos1.y + gSprites[playerEventObject->spriteId].pos2.y)) + TryGetObjectEventIdByLocalIdAndMap(45, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + fakePlayerObjectEvent = &gObjectEvents[objectEventId]; + gSprites[fakePlayerObjectEvent->spriteId].pos2.y += 4; + playerObjectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((gSprites[fakePlayerObjectEvent->spriteId].pos1.y + gSprites[fakePlayerObjectEvent->spriteId].pos2.y) >= + (gSprites[playerObjectEvent->spriteId].pos1.y + gSprites[playerObjectEvent->spriteId].pos2.y)) { DestroyTask(taskId); EnableBothScriptContexts(); diff --git a/src/naming_screen.c b/src/naming_screen.c index 73eda32c83..c140e328e0 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1172,7 +1172,7 @@ static void NamingScreen_CreatePlayerIcon(void) u8 spriteId; rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies); - spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } @@ -1199,7 +1199,7 @@ static void NamingScreen_CreateWandaDadIcon(void) { u8 spriteId; - spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } diff --git a/src/overworld.c b/src/overworld.c index c2e3d27892..65a4a4c721 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -149,15 +149,15 @@ static u8 GetLinkPlayerElevation(u8 linkPlayerId); static s32 sub_80878E4(u8 linkPlayerId); static u8 GetLinkPlayerIdAt(s16 x, s16 y); static void SetPlayerFacingDirection(u8 linkPlayerId, u8 a2); -static void ZeroEventObject(struct EventObject *eventObj); -static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4); -static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y); +static void ZeroObjectEvent(struct ObjectEvent *objEvent); +static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 a4); +static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s16 y); static void sub_80877DC(u8 linkPlayerId, u8 a2); static void sub_808780C(u8 linkPlayerId); static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId); static void sub_8087584(void); static u32 GetLinkSendQueueLength(void); -static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj); +static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerEventObj); static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *a1); static u16 GetDirectionForEventScript(const u8 *script); static void sub_8087510(void); @@ -217,7 +217,7 @@ EWRAM_DATA static u16 sLastMapSectionId = 0; EWRAM_DATA static struct InitialPlayerAvatarState gInitialPlayerAvatarState = {0}; EWRAM_DATA static u16 sAmbientCrySpecies = 0; EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE; -EWRAM_DATA struct LinkPlayerEventObject gLinkPlayerEventObjects[4] = {0}; +EWRAM_DATA struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4] = {0}; // const rom data static const struct WarpData sDummyWarpData = @@ -338,23 +338,23 @@ static const struct ScanlineEffectParams sFlashEffectParams = 0, }; -static u8 MovementEventModeCB_Normal(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 MovementEventModeCB_Ignored(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 MovementEventModeCB_Normal_2(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 MovementEventModeCB_Normal(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 MovementEventModeCB_Ignored(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 MovementEventModeCB_Normal_2(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); -static u8 (*const gLinkPlayerMovementModes[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static u8 (*const gLinkPlayerMovementModes[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { MovementEventModeCB_Normal, // MOVEMENT_MODE_FREE MovementEventModeCB_Ignored, // MOVEMENT_MODE_FROZEN MovementEventModeCB_Normal_2, // MOVEMENT_MODE_SCRIPTED }; -static u8 FacingHandler_DoNothing(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 FacingHandler_DpadMovement(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 FacingHandler_ForcedFacingChange(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 FacingHandler_DoNothing(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 FacingHandler_ForcedFacingChange(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); // These handlers return TRUE if the movement was scripted and successful, and FALSE otherwise. -static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { FacingHandler_DoNothing, FacingHandler_DpadMovement, @@ -369,11 +369,11 @@ static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerEventObject * FacingHandler_ForcedFacingChange, }; -static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerEventObject *, struct EventObject *); -static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject *, struct EventObject *); +static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *, struct ObjectEvent *); +static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *, struct ObjectEvent *); // These handlers are run after an attempted movement. -static void (*const gMovementStatusHandler[])(struct LinkPlayerEventObject *, struct EventObject *) = +static void (*const gMovementStatusHandler[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *) = { // FALSE: MovementStatusHandler_EnterFreeMode, @@ -496,18 +496,18 @@ void ApplyNewEncryptionKeyToGameStats(u32 newKey) void LoadEventObjTemplatesFromHeader(void) { // Clear map object templates - CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); + CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates)); // Copy map header events to save block - CpuCopy32(gMapHeader.events->eventObjects, - gSaveBlock1Ptr->eventObjectTemplates, - gMapHeader.events->eventObjectCount * sizeof(struct EventObjectTemplate)); + CpuCopy32(gMapHeader.events->objectEvents, + gSaveBlock1Ptr->objectEventTemplates, + gMapHeader.events->objectEventCount * sizeof(struct ObjectEventTemplate)); } void LoadSaveblockEventObjScripts(void) { - struct EventObjectTemplate *mapHeaderObjTemplates = gMapHeader.events->eventObjects; - struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *mapHeaderObjTemplates = gMapHeader.events->objectEvents; + struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; s32 i; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) @@ -517,15 +517,15 @@ void LoadSaveblockEventObjScripts(void) void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y) { s32 i; - struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { - struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i]; - if (eventObjectTemplate->localId == localId) + struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i]; + if (objectEventTemplate->localId == localId) { - eventObjectTemplate->x = x; - eventObjectTemplate->y = y; + objectEventTemplate->x = x; + objectEventTemplate->y = y; return; } } @@ -535,13 +535,13 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType) { s32 i; - struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { - struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i]; - if (eventObjectTemplate->localId == localId) + struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i]; + if (objectEventTemplate->localId == localId) { - eventObjectTemplate->movementType = movementType; + objectEventTemplate->movementType = movementType; return; } } @@ -853,9 +853,9 @@ static void mli0_load_map(u32 a1) if (!(sUnknown_020322D8 & 1)) { if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) - LoadBattlePyramidEventObjectTemplates(); + LoadBattlePyramidObjectEventTemplates(); else if (InTrainerHill()) - LoadTrainerHillEventObjectTemplates(); + LoadTrainerHillObjectEventTemplates(); else LoadEventObjTemplatesFromHeader(); } @@ -1721,13 +1721,13 @@ void CB2_ContinueSavedGame(void) ClearDiveAndHoleWarps(); trainerHillMapId = GetCurrentTrainerHillMapId(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) - LoadBattlePyramidFloorEventObjectScripts(); + LoadBattlePyramidFloorObjectEventScripts(); else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE) - LoadTrainerHillFloorEventObjectScripts(); + LoadTrainerHillFloorObjectEventScripts(); else LoadSaveblockEventObjScripts(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DoTimeBasedEvents(); sub_8084788(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) @@ -2143,9 +2143,9 @@ static void sub_8086988(u32 a1) ResetCameraUpdateInfo(); InstallCameraPanAheadCallback(); if (!a1) - InitEventObjectPalettes(0); + InitObjectEventPalettes(0); else - InitEventObjectPalettes(1); + InitObjectEventPalettes(1); FieldEffectActiveListClear(); StartWeather(); @@ -2160,8 +2160,8 @@ static void sub_80869DC(void) { gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - ResetEventObjects(); - TrySpawnEventObjects(0, 0); + ResetObjectEvents(); + TrySpawnObjectEvents(0, 0); TryRunOnWarpIntoMapScript(); } @@ -2172,13 +2172,13 @@ static void mli4_mapscripts_and_other(void) gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - ResetEventObjects(); + ResetObjectEvents(); GetCameraFocusCoords(&x, &y); player = GetInitialPlayerAvatarState(); InitPlayerAvatar(x, y, player->direction, gSaveBlock2Ptr->playerGender); SetPlayerAvatarTransitionFlags(player->transitionFlags); ResetInitialPlayerAvatarState(); - TrySpawnEventObjects(0, 0); + TrySpawnObjectEvents(0, 0); TryRunOnWarpIntoMapScript(); } @@ -2191,7 +2191,7 @@ static void sub_8086A68(void) static void sub_8086A80(void) { - gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera = 1; + gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera = 1; InitCameraUpdateCallback(gPlayerAvatar.spriteId); } @@ -2226,7 +2226,7 @@ static void sub_8086B14(void) for (i = 0; i < gFieldLinkPlayerCount; i++) { - SpawnLinkPlayerEventObject(i, i + x, y, gLinkPlayers[i].gender); + SpawnLinkPlayerObjectEvent(i, i + x, y, gLinkPlayers[i].gender); CreateLinkPlayerSprite(i, gLinkPlayers[i].version); } @@ -2702,7 +2702,7 @@ static void LoadTradeRoomPlayer(s32 linkPlayerId, s32 myPlayerId, struct TradeRo trainer->playerId = linkPlayerId; trainer->isLocalPlayer = (linkPlayerId == myPlayerId) ? 1 : 0; - trainer->c = gLinkPlayerEventObjects[linkPlayerId].movementMode; + trainer->c = gLinkPlayerObjectEvents[linkPlayerId].movementMode; trainer->facing = GetLinkPlayerFacingDirection(linkPlayerId); GetLinkPlayerCoords(linkPlayerId, &x, &y); trainer->pos.x = x; @@ -2918,110 +2918,110 @@ static u32 GetLinkSendQueueLength(void) return gLink.sendQueue.count; } -static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj) +static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerEventObj) { - memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerEventObject)); + memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerObjectEvent)); } -void ClearLinkPlayerEventObjects(void) +void ClearLinkPlayerObjectEvents(void) { - memset(gLinkPlayerEventObjects, 0, sizeof(gLinkPlayerEventObjects)); + memset(gLinkPlayerObjectEvents, 0, sizeof(gLinkPlayerObjectEvents)); } -static void ZeroEventObject(struct EventObject *eventObj) +static void ZeroObjectEvent(struct ObjectEvent *objEvent) { - memset(eventObj, 0, sizeof(struct EventObject)); + memset(objEvent, 0, sizeof(struct ObjectEvent)); } -static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) +static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 a4) { - u8 eventObjId = GetFirstInactiveEventObjectId(); - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + u8 objEventId = GetFirstInactiveObjectEventId(); + struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; - ZeroLinkPlayerEventObject(linkPlayerEventObj); - ZeroEventObject(eventObj); + ZeroLinkPlayerObjectEvent(linkPlayerEventObj); + ZeroObjectEvent(objEvent); linkPlayerEventObj->active = 1; linkPlayerEventObj->linkPlayerId = linkPlayerId; - linkPlayerEventObj->eventObjId = eventObjId; + linkPlayerEventObj->objEventId = objEventId; linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; - eventObj->active = 1; - eventObj->singleMovementActive = a4; - eventObj->range.as_byte = 2; - eventObj->spriteId = 64; + objEvent->active = 1; + objEvent->singleMovementActive = a4; + objEvent->range.as_byte = 2; + objEvent->spriteId = 64; - InitLinkPlayerEventObjectPos(eventObj, x, y); + InitLinkPlayerObjectEventPos(objEvent, x, y); } -static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y) +static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s16 y) { - eventObj->currentCoords.x = x; - eventObj->currentCoords.y = y; - eventObj->previousCoords.x = x; - eventObj->previousCoords.y = y; - SetSpritePosToMapCoords(x, y, &eventObj->initialCoords.x, &eventObj->initialCoords.y); - eventObj->initialCoords.x += 8; - EventObjectUpdateZCoord(eventObj); + objEvent->currentCoords.x = x; + objEvent->currentCoords.y = y; + objEvent->previousCoords.x = x; + objEvent->previousCoords.y = y; + SetSpritePosToMapCoords(x, y, &objEvent->initialCoords.x, &objEvent->initialCoords.y); + objEvent->initialCoords.x += 8; + ObjectEventUpdateZCoord(objEvent); } static void sub_80877DC(u8 linkPlayerId, u8 a2) { - if (gLinkPlayerEventObjects[linkPlayerId].active) + if (gLinkPlayerObjectEvents[linkPlayerId].active) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - eventObj->range.as_byte = a2; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + objEvent->range.as_byte = a2; } } static void sub_808780C(u8 linkPlayerId) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - if (eventObj->spriteId != MAX_SPRITES) - DestroySprite(&gSprites[eventObj->spriteId]); + struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerEventObj->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + if (objEvent->spriteId != MAX_SPRITES) + DestroySprite(&gSprites[objEvent->spriteId]); linkPlayerEventObj->active = 0; - eventObj->active = 0; + objEvent->active = 0; } // Returns the spriteId corresponding to this player. static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->spriteId; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->spriteId; } static void GetLinkPlayerCoords(u8 linkPlayerId, u16 *x, u16 *y) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - *x = eventObj->currentCoords.x; - *y = eventObj->currentCoords.y; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + *x = objEvent->currentCoords.x; + *y = objEvent->currentCoords.y; } static u8 GetLinkPlayerFacingDirection(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->range.as_byte; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->range.as_byte; } static u8 GetLinkPlayerElevation(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->currentElevation; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->currentElevation; } static s32 sub_80878E4(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return 16 - (s8)eventObj->directionSequenceIndex; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return 16 - (s8)objEvent->directionSequenceIndex; } static u8 GetLinkPlayerIdAt(s16 x, s16 y) @@ -3029,11 +3029,11 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) u8 i; for (i = 0; i < MAX_LINK_PLAYERS; i++) { - if (gLinkPlayerEventObjects[i].active - && (gLinkPlayerEventObjects[i].movementMode == 0 || gLinkPlayerEventObjects[i].movementMode == 2)) + if (gLinkPlayerObjectEvents[i].active + && (gLinkPlayerObjectEvents[i].movementMode == 0 || gLinkPlayerObjectEvents[i].movementMode == 2)) { - struct EventObject *eventObj = &gEventObjects[gLinkPlayerEventObjects[i].eventObjId]; - if (eventObj->currentCoords.x == x && eventObj->currentCoords.y == y) + struct ObjectEvent *objEvent = &gObjectEvents[gLinkPlayerObjectEvents[i].objEventId]; + if (objEvent->currentCoords.x == x && objEvent->currentCoords.y == y) return i; } } @@ -3042,23 +3042,23 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerEventObj->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; if (linkPlayerEventObj->active) { if (facing > FACING_FORCED_RIGHT) { - eventObj->triggerGroundEffectsOnMove = 1; + objEvent->triggerGroundEffectsOnMove = 1; } else { // This is a hack to split this code onto two separate lines, without declaring a local variable. // C++ style inline variables would be nice here. - #define TEMP gLinkPlayerMovementModes[linkPlayerEventObj->movementMode](linkPlayerEventObj, eventObj, facing) + #define TEMP gLinkPlayerMovementModes[linkPlayerEventObj->movementMode](linkPlayerEventObj, objEvent, facing) - gMovementStatusHandler[TEMP](linkPlayerEventObj, eventObj); + gMovementStatusHandler[TEMP](linkPlayerEventObj, objEvent); // Clean up the hack. #undef TEMP @@ -3067,67 +3067,67 @@ static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) } -static u8 MovementEventModeCB_Normal(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 MovementEventModeCB_Normal(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { - return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, eventObj, a3); + return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, objEvent, a3); } -static u8 MovementEventModeCB_Ignored(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 MovementEventModeCB_Ignored(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { return FACING_UP; } // Duplicate Function -static u8 MovementEventModeCB_Normal_2(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 MovementEventModeCB_Normal_2(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { - return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, eventObj, a3); + return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, objEvent, a3); } -static bool8 FacingHandler_DoNothing(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_DoNothing(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { return FALSE; } -static bool8 FacingHandler_DpadMovement(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { s16 x, y; - eventObj->range.as_byte = FlipVerticalAndClearForced(a3, eventObj->range.as_byte); - EventObjectMoveDestCoords(eventObj, eventObj->range.as_byte, &x, &y); + objEvent->range.as_byte = FlipVerticalAndClearForced(a3, objEvent->range.as_byte); + ObjectEventMoveDestCoords(objEvent, objEvent->range.as_byte, &x, &y); - if (LinkPlayerDetectCollision(linkPlayerEventObj->eventObjId, eventObj->range.as_byte, x, y)) + if (LinkPlayerDetectCollision(linkPlayerEventObj->objEventId, objEvent->range.as_byte, x, y)) { return FALSE; } else { - eventObj->directionSequenceIndex = 16; - ShiftEventObjectCoords(eventObj, x, y); - EventObjectUpdateZCoord(eventObj); + objEvent->directionSequenceIndex = 16; + ShiftObjectEventCoords(objEvent, x, y); + ObjectEventUpdateZCoord(objEvent); return TRUE; } } -static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { - eventObj->range.as_byte = FlipVerticalAndClearForced(a3, eventObj->range.as_byte); + objEvent->range.as_byte = FlipVerticalAndClearForced(a3, objEvent->range.as_byte); return FALSE; } // This is called every time a free movement happens. Most of the time it's a No-Op. -static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent) { linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; } -static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent) { - eventObj->directionSequenceIndex--; + objEvent->directionSequenceIndex--; linkPlayerEventObj->movementMode = MOVEMENT_MODE_FROZEN; - MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y); - if (!eventObj->directionSequenceIndex) + MoveCoords(objEvent->range.as_byte, &objEvent->initialCoords.x, &objEvent->initialCoords.y); + if (!objEvent->directionSequenceIndex) { - ShiftStillEventObjectCoords(eventObj); + ShiftStillObjectEventCoords(objEvent); linkPlayerEventObj->movementMode = MOVEMENT_MODE_SCRIPTED; } } @@ -3162,8 +3162,8 @@ static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) { if (i != selfEventObjId) { - if ((gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) - || (gEventObjects[i].previousCoords.x == x && gEventObjects[i].previousCoords.y == y)) + if ((gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y) + || (gObjectEvents[i].previousCoords.x == x && gObjectEvents[i].previousCoords.y == y)) { return 1; } @@ -3174,9 +3174,9 @@ static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerEventObj->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; struct Sprite *sprite; if (linkPlayerEventObj->active) @@ -3185,40 +3185,40 @@ static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) { case VERSION_FIRE_RED: case VERSION_LEAF_GREEN: - eventObj->spriteId = AddPseudoEventObject(GetFRLGAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + objEvent->spriteId = AddPseudoObjectEvent(GetFRLGAvatarGraphicsIdByGender(objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_RUBY: case VERSION_SAPPHIRE: - eventObj->spriteId = AddPseudoEventObject(GetRSAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + objEvent->spriteId = AddPseudoObjectEvent(GetRSAvatarGraphicsIdByGender(objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_EMERALD: - eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + objEvent->spriteId = AddPseudoObjectEvent(GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; } - sprite = &gSprites[eventObj->spriteId]; + sprite = &gSprites[objEvent->spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->data[0] = linkPlayerId; - eventObj->triggerGroundEffectsOnMove = 0; + objEvent->triggerGroundEffectsOnMove = 0; } } static void SpriteCB_LinkPlayer(struct Sprite *sprite) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[sprite->data[0]]; - struct EventObject *eventObj = &gEventObjects[linkPlayerEventObj->eventObjId]; - sprite->pos1.x = eventObj->initialCoords.x; - sprite->pos1.y = eventObj->initialCoords.y; - SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); - sprite->oam.priority = ZCoordToPriority(eventObj->previousElevation); + struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[sprite->data[0]]; + struct ObjectEvent *objEvent = &gObjectEvents[linkPlayerEventObj->objEventId]; + sprite->pos1.x = objEvent->initialCoords.x; + sprite->pos1.y = objEvent->initialCoords.y; + SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1); + sprite->oam.priority = ZCoordToPriority(objEvent->previousElevation); if (!linkPlayerEventObj->movementMode != MOVEMENT_MODE_FREE) - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObj->range.as_byte)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objEvent->range.as_byte)); else - StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(eventObj->range.as_byte)); + StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(objEvent->range.as_byte)); - UpdateEventObjectSpriteVisibility(sprite, 0); - if (eventObj->triggerGroundEffectsOnMove) + UpdateObjectEventSpriteVisibility(sprite, 0); + if (objEvent->triggerGroundEffectsOnMove) { sprite->invisible = ((sprite->data[7] & 4) >> 2); sprite->data[7]++; diff --git a/src/rotating_tile_puzzle.c b/src/rotating_tile_puzzle.c index 7238ec751b..48bedc0572 100644 --- a/src/rotating_tile_puzzle.c +++ b/src/rotating_tile_puzzle.c @@ -57,23 +57,23 @@ void FreeRotatingTilePuzzle(void) if (sRotatingTilePuzzle != NULL) FREE_AND_SET_NULL(sRotatingTilePuzzle); - id = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[id]); - ScriptMovement_UnfreezeEventObjects(); + id = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[id]); + ScriptMovement_UnfreezeObjectEvents(); } u16 MoveRotatingTileObjects(u8 puzzleNumber) { u8 i; - struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *objectEvents = gSaveBlock1Ptr->objectEventTemplates; u16 localId = 0; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { s32 puzzleTileStart; u8 puzzleTileNum; - s16 x = eventObjects[i].x + 7; - s16 y = eventObjects[i].y + 7; + s16 x = objectEvents[i].x + 7; + s16 y = objectEvents[i].y + 7; u16 metatile = MapGridGetMetatileIdAt(x, y); if (!sRotatingTilePuzzle->isTrickHouse) @@ -125,12 +125,12 @@ u16 MoveRotatingTileObjects(u8 puzzleNumber) continue; } - eventObjects[i].x += x; - eventObjects[i].y += y; - if (GetEventObjectIdByLocalIdAndMap(eventObjects[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT) + objectEvents[i].x += x; + objectEvents[i].y += y; + if (GetObjectEventIdByLocalIdAndMap(objectEvents[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT) { SaveRotatingTileObject(i, puzzleTileNum); - localId = eventObjects[i].localId; + localId = objectEvents[i].localId; ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); } // Never reached in normal gameplay @@ -148,7 +148,7 @@ void TurnRotatingTileObjects(void) { u8 i; s32 puzzleTileStart; - struct EventObjectTemplate *eventObjects; + struct ObjectEventTemplate *objectEvents; if (sRotatingTilePuzzle == NULL) return; @@ -158,14 +158,14 @@ void TurnRotatingTileObjects(void) else puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right; - eventObjects = gSaveBlock1Ptr->eventObjectTemplates; + objectEvents = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < sRotatingTilePuzzle->numObjects; i++) { s32 rotation; s8 tileDifference; - u8 eventObjectId; - s16 x = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].x + 7; - s16 y = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].y + 7; + u8 objectEventId; + s16 x = objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].x + 7; + s16 y = objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].y + 7; u16 metatile = MapGridGetMetatileIdAt(x, y); // NOTE: The following 2 assignments and if else could all be replaced with rotation = ROTATE_COUNTERCLOCKWISE @@ -194,35 +194,35 @@ void TurnRotatingTileObjects(void) rotation = ROTATE_NONE; } - eventObjectId = GetEventObjectIdByLocalIdAndMap(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - if (eventObjectId != EVENT_OBJECTS_COUNT) + objectEventId = GetObjectEventIdByLocalIdAndMap(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + if (objectEventId != EVENT_OBJECTS_COUNT) { const u8 *movementScript; - u8 direction = gEventObjects[eventObjectId].facingDirection; + u8 direction = gObjectEvents[objectEventId].facingDirection; if (rotation == ROTATE_COUNTERCLOCKWISE) { switch (direction) { case DIR_EAST: movementScript = RotatingTilePuzzle_Movement_FaceUp; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case DIR_SOUTH: movementScript = RotatingTilePuzzle_Movement_FaceRight; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; case DIR_WEST: movementScript = RotatingTilePuzzle_Movement_FaceDown; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case DIR_NORTH: movementScript = RotatingTilePuzzle_Movement_FaceLeft; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; default: continue; } - ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, + ScriptMovement_StartObjectMovementScript(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); @@ -234,24 +234,24 @@ void TurnRotatingTileObjects(void) { case DIR_EAST: movementScript = RotatingTilePuzzle_Movement_FaceDown; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case DIR_SOUTH: movementScript = RotatingTilePuzzle_Movement_FaceLeft; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; case DIR_WEST: movementScript = RotatingTilePuzzle_Movement_FaceUp; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case DIR_NORTH: movementScript = RotatingTilePuzzle_Movement_FaceRight; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; default: continue; } - ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, + ScriptMovement_StartObjectMovementScript(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); @@ -274,9 +274,9 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) s32 rotation; s32 puzzleTileStart; u16 movementType; - struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates; - s16 x = eventObjects[eventTemplateId].x + 7; - s16 y = eventObjects[eventTemplateId].y + 7; + struct ObjectEventTemplate *objectEvents = gSaveBlock1Ptr->objectEventTemplates; + s16 x = objectEvents[eventTemplateId].x + 7; + s16 y = objectEvents[eventTemplateId].y + 7; u16 metatile = MapGridGetMetatileIdAt(x, y); if (!sRotatingTilePuzzle->isTrickHouse) @@ -294,22 +294,22 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) else rotation = ROTATE_NONE; - movementType = eventObjects[eventTemplateId].movementType; + movementType = objectEvents[eventTemplateId].movementType; if (rotation == ROTATE_COUNTERCLOCKWISE) { switch (movementType) { case MOVEMENT_TYPE_FACE_RIGHT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case MOVEMENT_TYPE_FACE_DOWN: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; case MOVEMENT_TYPE_FACE_LEFT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case MOVEMENT_TYPE_FACE_UP: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; default: break; @@ -320,16 +320,16 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) switch (movementType) { case MOVEMENT_TYPE_FACE_RIGHT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case MOVEMENT_TYPE_FACE_DOWN: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; case MOVEMENT_TYPE_FACE_LEFT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case MOVEMENT_TYPE_FACE_UP: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; default: break; diff --git a/src/scrcmd.c b/src/scrcmd.c index a9be5c3ef9..f712d6f44c 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1052,7 +1052,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - RemoveEventObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1062,7 +1062,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - RemoveEventObjectByLocalIdAndMap(objectId, mapNum, mapGroup); + RemoveObjectEventByLocalIdAndMap(objectId, mapNum, mapGroup); return FALSE; } @@ -1070,7 +1070,7 @@ bool8 ScrCmd_addobject(struct ScriptContext *ctx) { u16 objectId = VarGet(ScriptReadHalfword(ctx)); - TrySpawnEventObject(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1080,7 +1080,7 @@ bool8 ScrCmd_addobject_at(struct ScriptContext *ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - TrySpawnEventObject(objectId, mapNum, mapGroup); + TrySpawnObjectEvent(objectId, mapNum, mapGroup); return FALSE; } @@ -1090,7 +1090,7 @@ bool8 ScrCmd_setobjectxy(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - TryMoveEventObjectToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y); + TryMoveObjectEventToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y); return FALSE; } @@ -1108,7 +1108,7 @@ bool8 ScrCmd_copyobjectxytoperm(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - TryOverrideEventObjectTemplateCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryOverrideObjectEventTemplateCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1155,9 +1155,9 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx) bool8 ScrCmd_faceplayer(struct ScriptContext *ctx) { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], GetPlayerFacingDirection()); } return FALSE; @@ -1168,7 +1168,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 direction = ScriptReadByte(ctx); - EventObjectTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); + ObjectEventTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); return FALSE; } @@ -1211,7 +1211,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx) } else { - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_80983C4); return TRUE; } @@ -1225,14 +1225,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx) } else { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - LockSelectedEventObject(); + LockSelectedObjectEvent(); SetupNativeScript(ctx, sub_809847C); } else { - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_80983C4); } return TRUE; @@ -1244,10 +1244,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) u8 playerObjectId; HideFieldMessageBox(); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); return FALSE; } @@ -1256,12 +1256,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) u8 playerObjectId; HideFieldMessageBox(); - if (gEventObjects[gSelectedEventObject].active) - EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); return FALSE; } @@ -2178,7 +2178,7 @@ bool8 ScrCmd_freerotatingtilepuzzle(struct ScriptContext *ctx) bool8 ScrCmd_cmdD8(struct ScriptContext *ctx) { - gSelectedEventObject = GetCurrentApproachingTrainerEventObjectId(); + gSelectedObjectEvent = GetCurrentApproachingTrainerObjectEventId(); return FALSE; } @@ -2190,7 +2190,7 @@ bool8 ScrCmd_cmdD9(struct ScriptContext *ctx) } else { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { sub_8098630(); SetupNativeScript(ctx, sub_8098734); diff --git a/src/script.c b/src/script.c index 34484561cc..9ba1a74297 100644 --- a/src/script.c +++ b/src/script.c @@ -426,7 +426,7 @@ u8 *GetSavedRamScriptIfValid(void) } } -void InitRamScript_NoEventObject(u8 *script, u16 scriptSize) +void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize) { if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script)) scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script); diff --git a/src/script_movement.c b/src/script_movement.c index 03d6b10e89..21f0661097 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -9,13 +9,13 @@ // static functions static void ScriptMovement_StartMoveObjects(u8 priority); static u8 GetMoveObjectsTaskId(void); -static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 *movementScript); -static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId); +static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 *movementScript); +static u8 GetMovementScriptIdFromObjectEventId(u8 taskId, u8 objEventId); static bool8 IsMovementScriptFinished(u8 taskId, u8 moveScrId); -static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript); +static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript); static void ScriptMovement_UnfreezeActiveObjects(u8 taskId); static void ScriptMovement_MoveObjects(u8 taskId); -static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript); +static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript); // EWRAM_DATA static EWRAM_DATA const u8 *gMovementScripts[EVENT_OBJECTS_COUNT] = {0}; @@ -23,31 +23,31 @@ static EWRAM_DATA const u8 *gMovementScripts[EVENT_OBJECTS_COUNT] = {0}; // text bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript) { - u8 eventObjId; + u8 objEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objEventId)) return TRUE; if (!FuncIsActiveTask(ScriptMovement_MoveObjects)) ScriptMovement_StartMoveObjects(50); - return ScriptMovement_TryAddNewMovement(GetMoveObjectsTaskId(), eventObjId, movementScript); + return ScriptMovement_TryAddNewMovement(GetMoveObjectsTaskId(), objEventId, movementScript); } bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjId; + u8 objEventId; u8 taskId; u8 moveScrId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objEventId)) return TRUE; taskId = GetMoveObjectsTaskId(); - moveScrId = GetMovementScriptIdFromEventObjectId(taskId, eventObjId); + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, objEventId); if (moveScrId == EVENT_OBJECTS_COUNT) return TRUE; return IsMovementScriptFinished(taskId, moveScrId); } -void ScriptMovement_UnfreezeEventObjects(void) +void ScriptMovement_UnfreezeObjectEvents(void) { u8 taskId; @@ -75,11 +75,11 @@ static u8 GetMoveObjectsTaskId(void) return FindTaskIdByFunc(ScriptMovement_MoveObjects); } -static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 *movementScript) +static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 *movementScript) { u8 moveScrId; - moveScrId = GetMovementScriptIdFromEventObjectId(taskId, eventObjId); + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, objEventId); if (moveScrId != EVENT_OBJECTS_COUNT) { if (IsMovementScriptFinished(taskId, moveScrId) == 0) @@ -88,23 +88,23 @@ static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 } else { - ScriptMovement_AddNewMovement(taskId, moveScrId, eventObjId, movementScript); + ScriptMovement_AddNewMovement(taskId, moveScrId, objEventId, movementScript); return FALSE; } } - moveScrId = GetMovementScriptIdFromEventObjectId(taskId, EVENT_OBJ_ID_PLAYER); + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, EVENT_OBJ_ID_PLAYER); if (moveScrId == EVENT_OBJECTS_COUNT) { return TRUE; } else { - ScriptMovement_AddNewMovement(taskId, moveScrId, eventObjId, movementScript); + ScriptMovement_AddNewMovement(taskId, moveScrId, objEventId, movementScript); return FALSE; } } -static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId) +static u8 GetMovementScriptIdFromObjectEventId(u8 taskId, u8 objEventId) { u8 *moveScriptId; u8 i; @@ -112,13 +112,13 @@ static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId) moveScriptId = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < EVENT_OBJECTS_COUNT; i++, moveScriptId++) { - if (*moveScriptId == eventObjId) + if (*moveScriptId == objEventId) return i; } return EVENT_OBJECTS_COUNT; } -static void LoadEventObjectIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pEventObjId) +static void LoadObjectEventIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pEventObjId) { u8 i; @@ -127,20 +127,20 @@ static void LoadEventObjectIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 * ; } -static void SetEventObjectIdAtMovementScript(u8 taskId, u8 moveScrId, u8 eventObjId) +static void SetObjectEventIdAtMovementScript(u8 taskId, u8 moveScrId, u8 objEventId) { u8 *ptr; - LoadEventObjectIdPtrFromMovementScript(taskId, moveScrId, &ptr); - *ptr = eventObjId; + LoadObjectEventIdPtrFromMovementScript(taskId, moveScrId, &ptr); + *ptr = objEventId; } -static void LoadEventObjectIdFromMovementScript(u8 taskId, u8 moveScrId, u8 *eventObjId) +static void LoadObjectEventIdFromMovementScript(u8 taskId, u8 moveScrId, u8 *objEventId) { u8 *ptr; - LoadEventObjectIdPtrFromMovementScript(taskId, moveScrId, &ptr); - *eventObjId = *ptr; + LoadObjectEventIdPtrFromMovementScript(taskId, moveScrId, &ptr); + *objEventId = *ptr; } static void ClearMovementScriptFinished(u8 taskId, u8 moveScrId) @@ -175,11 +175,11 @@ static const u8 *GetMovementScript(u8 moveScrId) return gMovementScripts[moveScrId]; } -static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript) +static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript) { ClearMovementScriptFinished(taskId, moveScrId); SetMovementScript(moveScrId, movementScript); - SetEventObjectIdAtMovementScript(taskId, moveScrId, eventObjId); + SetObjectEventIdAtMovementScript(taskId, moveScrId, objEventId); } static void ScriptMovement_UnfreezeActiveObjects(u8 taskId) @@ -191,40 +191,40 @@ static void ScriptMovement_UnfreezeActiveObjects(u8 taskId) for (i = 0; i < EVENT_OBJECTS_COUNT; i++, pEventObjId++) { if (*pEventObjId != 0xFF) - UnfreezeEventObject(&gEventObjects[*pEventObjId]); + UnfreezeObjectEvent(&gObjectEvents[*pEventObjId]); } } static void ScriptMovement_MoveObjects(u8 taskId) { u8 i; - u8 eventObjId; + u8 objEventId; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - LoadEventObjectIdFromMovementScript(taskId, i, &eventObjId); - if (eventObjId != 0xFF) - ScriptMovement_TakeStep(taskId, i, eventObjId, GetMovementScript(i)); + LoadObjectEventIdFromMovementScript(taskId, i, &objEventId); + if (objEventId != 0xFF) + ScriptMovement_TakeStep(taskId, i, objEventId, GetMovementScript(i)); } } -static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript) +static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript) { u8 nextMoveActionId; - if (EventObjectIsHeldMovementActive(&gEventObjects[eventObjId]) - && !EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) + if (ObjectEventIsHeldMovementActive(&gObjectEvents[objEventId]) + && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId])) return; nextMoveActionId = *movementScript; if (nextMoveActionId == MOVEMENT_ACTION_STEP_END) { SetMovementScriptFinished(taskId, moveScrId); - FreezeEventObject(&gEventObjects[eventObjId]); + FreezeObjectEvent(&gObjectEvents[objEventId]); } else { - if (!EventObjectSetHeldMovement(&gEventObjects[eventObjId], nextMoveActionId)) + if (!ObjectEventSetHeldMovement(&gObjectEvents[objEventId], nextMoveActionId)) { movementScript++; SetMovementScript(moveScrId, movementScript); diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 8c66be30f1..a79c37d8cd 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -33,10 +33,10 @@ #include "constants/vars.h" #include "constants/battle_frontier.h" -extern const u16 gEventObjectPalette8[]; -extern const u16 gEventObjectPalette17[]; -extern const u16 gEventObjectPalette33[]; -extern const u16 gEventObjectPalette34[]; +extern const u16 gObjectEventPalette8[]; +extern const u16 gObjectEventPalette17[]; +extern const u16 gObjectEventPalette33[]; +extern const u16 gObjectEventPalette34[]; static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 }; @@ -263,7 +263,7 @@ void SetLinkContestPlayerGfx(void) void LoadLinkContestPlayerPalettes(void) { int i; - u8 eventObjectId; + u8 objectEventId; int version; struct Sprite *sprite; @@ -272,23 +272,23 @@ void LoadLinkContestPlayerPalettes(void) { for (i = 0; i < gNumLinkContestPlayers; i++) { - eventObjectId = GetEventObjectIdByLocalIdAndMap(gUnknown_0858D8EC[i], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - sprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gUnknown_0858D8EC[i], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + sprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->oam.paletteNum = 6 + i; version = (u8)gLinkPlayers[i].version; if (version == VERSION_RUBY || version == VERSION_SAPPHIRE) { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gEventObjectPalette33, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette33, 0x160 + i * 0x10, 0x20); else - LoadPalette(gEventObjectPalette34, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette34, 0x160 + i * 0x10, 0x20); } else { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gEventObjectPalette8, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette8, 0x160 + i * 0x10, 0x20); else - LoadPalette(gEventObjectPalette17, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette17, 0x160 + i * 0x10, 0x20); } } } diff --git a/src/secret_base.c b/src/secret_base.c index b9826a2572..3cbbab0dc4 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -437,7 +437,7 @@ bool8 SecretBaseMapPopupEnabled(void) static void EnterNewlyCreatedSecretBase_WaitFadeIn(u8 taskId) { - EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_NORTH); + ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_NORTH); if (IsWeatherNotFadingIn() == TRUE) { EnableBothScriptContexts(); @@ -531,13 +531,13 @@ void InitSecretBaseDecorationSprites(void) u8 i; u8 *decorations; u8 *decorationPositions; - u8 eventObjectId; + u8 objectEventId; u8 metatileBehavior; u8 category; u8 permission; u8 numDecorations; - eventObjectId = 0; + objectEventId = 0; if (!CurMapIsSecretBase()) { decorations = gSaveBlock1Ptr->playerRoomDecor; @@ -561,13 +561,13 @@ void InitSecretBaseDecorationSprites(void) category = gDecorations[decorations[i]].category; if (permission == DECORPERM_SPRITE) { - for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++) + for (objectEventId = 0; objectEventId < gMapHeader.events->objectEventCount; objectEventId++) { - if (gMapHeader.events->eventObjects[eventObjectId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004) + if (gMapHeader.events->objectEvents[objectEventId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004) break; } - if (eventObjectId == gMapHeader.events->eventObjectCount) + if (objectEventId == gMapHeader.events->objectEventCount) continue; gSpecialVar_0x8006 = decorationPositions[i] >> 4; @@ -576,13 +576,13 @@ void InitSecretBaseDecorationSprites(void) if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE || MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE) { - gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[eventObjectId].graphicsId - EVENT_OBJ_GFX_VAR_0); + gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objectEventId].graphicsId - EVENT_OBJ_GFX_VAR_0); VarSet(gSpecialVar_Result, gDecorations[decorations[i]].tiles[0]); - gSpecialVar_Result = gMapHeader.events->eventObjects[eventObjectId].localId; + gSpecialVar_Result = gMapHeader.events->objectEvents[objectEventId].localId; FlagClear(FLAG_DECORATION_1 + gSpecialVar_0x8004); - TrySpawnEventObject(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - TryMoveEventObjectToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideEventObjectTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryMoveObjectEventToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); + TryOverrideObjectEventTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); if (CurMapIsSecretBase() == TRUE && VarGet(VAR_CURRENT_SECRET_BASE) != 0) { if (category == DECORCAT_DOLL) @@ -611,16 +611,16 @@ void InitSecretBaseDecorationSprites(void) void HideSecretBaseDecorationSprites(void) { - u8 eventObjectId; + u8 objectEventId; u16 flag; - for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++) + for (objectEventId = 0; objectEventId < gMapHeader.events->objectEventCount; objectEventId++) { - flag = gMapHeader.events->eventObjects[eventObjectId].flagId; + flag = gMapHeader.events->objectEvents[objectEventId].flagId; if (flag >= FLAG_DECORATION_1 && flag <= FLAG_DECORATION_14) { - RemoveEventObjectByLocalIdAndMap( - gMapHeader.events->eventObjects[eventObjectId].localId, + RemoveObjectEventByLocalIdAndMap( + gMapHeader.events->objectEvents[objectEventId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(flag); diff --git a/src/shop.c b/src/shop.c index c9cd1919a5..7a51b32b89 100755 --- a/src/shop.c +++ b/src/shop.c @@ -67,13 +67,13 @@ static void BuyMenuRemoveItemIcon(u16, u8); static void BuyMenuPrint(u8 windowId, const u8 *text, u8 x, u8 y, s8 speed, u8 colorSet); static void BuyMenuDrawMapGraphics(void); static void BuyMenuCopyMenuBgToBg1TilemapBuffer(void); -static void BuyMenuCollectEventObjectData(void); -static void BuyMenuDrawEventObjects(void); +static void BuyMenuCollectObjectEventData(void); +static void BuyMenuDrawObjectEvents(void); static void BuyMenuDrawMapBg(void); static bool8 BuyMenuCheckForOverlapWithMenuBg(int, int); static void BuyMenuDrawMapMetatile(s16, s16, const u16*, u8); static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src); -static bool8 BuyMenuCheckIfEventObjectOverlapsMenuBg(s16 *); +static bool8 BuyMenuCheckIfObjectEventOverlapsMenuBg(s16 *); static void ExitBuyMenu(u8 taskId); static void Task_ExitBuyMenu(u8 taskId); static void BuyMenuTryMakePurchase(u8 taskId); @@ -714,8 +714,8 @@ static void BuyMenuDrawGraphics(void) static void BuyMenuDrawMapGraphics(void) { - BuyMenuCollectEventObjectData(); - BuyMenuDrawEventObjects(); + BuyMenuCollectObjectEventData(); + BuyMenuDrawObjectEvents(); BuyMenuDrawMapBg(); } @@ -787,7 +787,7 @@ static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, con dest[offset1 + offset2 + 33] = src[3]; // bottom right } -static void BuyMenuCollectEventObjectData(void) +static void BuyMenuCollectObjectEventData(void) { s16 facingX; s16 facingY; @@ -802,16 +802,16 @@ static void BuyMenuCollectEventObjectData(void) { for (x = 0; x < 7; x++) { - u8 eventObjId = GetEventObjectIdByXY(facingX - 4 + x, facingY - 2 + y); + u8 objEventId = GetObjectEventIdByXY(facingX - 4 + x, facingY - 2 + y); - if (eventObjId != 16) + if (objEventId != 16) { - gShopDataPtr->viewportObjects[r8][EVENT_OBJ_ID] = eventObjId; + gShopDataPtr->viewportObjects[r8][EVENT_OBJ_ID] = objEventId; gShopDataPtr->viewportObjects[r8][X_COORD] = x; gShopDataPtr->viewportObjects[r8][Y_COORD] = y; gShopDataPtr->viewportObjects[r8][LAYER_TYPE] = MapGridGetMetatileLayerTypeAt(facingX - 4 + x, facingY - 2 + y); - switch (gEventObjects[eventObjId].facingDirection) + switch (gObjectEvents[objEventId].facingDirection) { case DIR_SOUTH: gShopDataPtr->viewportObjects[r8][ANIM_NUM] = 0; @@ -833,27 +833,27 @@ static void BuyMenuCollectEventObjectData(void) } } -static void BuyMenuDrawEventObjects(void) +static void BuyMenuDrawObjectEvents(void) { u8 i; u8 spriteId; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; for (i = 0; i < 16; i++) // max objects? { if (gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID] == 16) continue; - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId); - spriteId = AddPseudoEventObject( - gEventObjects[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId, + spriteId = AddPseudoObjectEvent( + gObjectEvents[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId, SpriteCallbackDummy, (u16)gShopDataPtr->viewportObjects[i][X_COORD] * 16 + 8, (u16)gShopDataPtr->viewportObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2, 2); - if (BuyMenuCheckIfEventObjectOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE) + if (BuyMenuCheckIfObjectEventOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE) { gSprites[spriteId].subspriteTableNum = 4; gSprites[spriteId].subspriteMode = 1; @@ -863,7 +863,7 @@ static void BuyMenuDrawEventObjects(void) } } -static bool8 BuyMenuCheckIfEventObjectOverlapsMenuBg(s16 *object) +static bool8 BuyMenuCheckIfObjectEventOverlapsMenuBg(s16 *object) { if (!BuyMenuCheckForOverlapWithMenuBg(object[X_COORD], object[Y_COORD] + 2) && object[LAYER_TYPE] != MB_SECRET_BASE_WALL) { diff --git a/src/start_menu.c b/src/start_menu.c index c24497d74f..ae26f99b37 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -543,7 +543,7 @@ void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s { if (!IsUpdateLinkStateCBActive()) { - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); } @@ -746,7 +746,7 @@ static bool8 StartMenuBattlePyramidRetireCallback(void) void sub_809FDD4(void) { ClearDialogWindowAndFrameToTransparent(0, FALSE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); CreateStartMenuTask(sub_809FA34); ScriptContext2_Enable(); } @@ -788,7 +788,7 @@ static bool8 SaveCallback(void) case SAVE_SUCCESS: case SAVE_ERROR: // Close start menu ClearDialogWindowAndFrameToTransparent(0, TRUE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); SoftResetInBattlePyramid(); return TRUE; @@ -825,7 +825,7 @@ static bool8 BattlePyramidRetireCallback(void) return FALSE; case SAVE_CANCELED: // Yes (Retire from battle pyramid) ClearDialogWindowAndFrameToTransparent(0, TRUE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); return TRUE; @@ -1382,7 +1382,7 @@ static void HideStartMenuWindow(void) { ClearStdWindowAndFrame(GetStartMenuWindowId(), TRUE); RemoveStartMenuWindow(); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } diff --git a/src/trainer_hill.c b/src/trainer_hill.c index b84920a62e..f7b08f350b 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -251,7 +251,7 @@ static const u8 *const sTagMatchStrings[] = gText_ExpertTagMatch, }; -static const struct EventObjectTemplate sTrainerEventObjectTemplate = +static const struct ObjectEventTemplate sTrainerObjectEventTemplate = { .graphicsId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, .elevation = 3, @@ -629,25 +629,25 @@ static void SetTimerValue(u32 *dst, u32 val) *dst = val; } -void LoadTrainerHillEventObjectTemplates(void) +void LoadTrainerHillObjectEventTemplates(void) { u8 i, floorId; - struct EventObjectTemplate *eventTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *eventTemplates = gSaveBlock1Ptr->objectEventTemplates; - if (!LoadTrainerHillFloorEventObjectScripts()) + if (!LoadTrainerHillFloorObjectEventScripts()) return; SetUpDataStruct(); for (i = 0; i < 2; i++) gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; - CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); + CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates)); floorId = GetFloorId(); for (i = 0; i < 2; i++) { u8 bits; - eventTemplates[i] = sTrainerEventObjectTemplate; + eventTemplates[i] = sTrainerObjectEventTemplate; eventTemplates[i].localId = i + 1; eventTemplates[i].graphicsId = FacilityClassToGraphicsId(sHillData->floors[floorId].trainers[i].facilityClass); eventTemplates[i].x = sHillData->floors[floorId].display.coords[i] & 0xF; @@ -662,7 +662,7 @@ void LoadTrainerHillEventObjectTemplates(void) FreeDataStruct(); } -bool32 LoadTrainerHillFloorEventObjectScripts(void) +bool32 LoadTrainerHillFloorObjectEventScripts(void) { SetUpDataStruct(); // Something may have been dummied here @@ -860,10 +860,10 @@ u16 LocalIdToHillTrainerId(u8 localId) return gSaveBlock2Ptr->frontier.trainerIds[localId - 1]; } -bool8 GetHillTrainerFlag(u8 eventObjectId) +bool8 GetHillTrainerFlag(u8 objectEventId) { u32 floorId = GetFloorId() * 2; - u8 bitId = gEventObjects[eventObjectId].localId - 1 + floorId; + u8 bitId = gObjectEvents[objectEventId].localId - 1 + floorId; return gSaveBlock2Ptr->frontier.trainerFlags & gBitTable[bitId]; } diff --git a/src/trainer_see.c b/src/trainer_see.c index 72e9037285..8b5e74d137 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -19,31 +19,31 @@ #include "constants/field_effects.h" // this file's functions -static u8 CheckTrainer(u8 eventObjectId); -static u8 GetTrainerApproachDistance(struct EventObject *trainerObj); -static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction); -static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range); +static u8 CheckTrainer(u8 objectEventId); +static u8 GetTrainerApproachDistance(struct ObjectEvent *trainerObj); +static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction); +static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range); static void Task_RunTrainerSeeFuncList(u8 taskId); static void Task_DestroyTrainerApproachTask(u8 taskId); static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum); -static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); -static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B4178(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); static void SpriteCB_TrainerIcons(struct Sprite *sprite); @@ -62,7 +62,7 @@ static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp"); static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp"); -static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *trainerObj, s16 range, s16 x, s16 y) = +static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) = { GetTrainerApproachDistanceSouth, GetTrainerApproachDistanceNorth, @@ -70,7 +70,7 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *train GetTrainerApproachDistanceEast, }; -static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = +static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) = { sub_80B4178, TrainerExclamationMark, @@ -86,7 +86,7 @@ static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct WaitRevealHiddenTrainer, }; -static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = +static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) = { RevealHiddenTrainer, PopOutOfAshHiddenTrainer, @@ -183,9 +183,9 @@ bool8 CheckForTrainersWantingBattle(void) { u8 retVal; - if (!gEventObjects[i].active) + if (!gObjectEvents[i].active) continue; - if (gEventObjects[i].trainerType != 1 && gEventObjects[i].trainerType != 3) + if (gObjectEvents[i].trainerType != 1 && gObjectEvents[i].trainerType != 3) continue; retVal = CheckTrainer(i); @@ -204,7 +204,7 @@ bool8 CheckForTrainersWantingBattle(void) if (gNoOfApproachingTrainers == 1) { ResetTrainerOpponentIds(); - ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].eventObjectId, + ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].objectEventId, gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr); gTrainerApproachedPlayer = TRUE; return TRUE; @@ -214,7 +214,7 @@ bool8 CheckForTrainersWantingBattle(void) ResetTrainerOpponentIds(); for (i = 0; i < gNoOfApproachingTrainers; i++, gApproachingTrainerId++) { - ConfigureTwoTrainersBattle(gApproachingTrainers[i].eventObjectId, + ConfigureTwoTrainersBattle(gApproachingTrainers[i].objectEventId, gApproachingTrainers[i].trainerScriptPtr); } SetUpTwoTrainersBattle(); @@ -229,7 +229,7 @@ bool8 CheckForTrainersWantingBattle(void) } } -static u8 CheckTrainer(u8 eventObjectId) +static u8 CheckTrainer(u8 objectEventId) { const u8 *scriptPtr; u8 ret = 1; @@ -238,16 +238,16 @@ static u8 CheckTrainer(u8 eventObjectId) if (InTrainerHill() == TRUE) scriptPtr = GetTrainerHillTrainerScript(); else - scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjectId); + scriptPtr = GetObjectEventScriptPointerByObjectEventId(objectEventId); if (InBattlePyramid()) { - if (GetBattlePyramidTrainerFlag(eventObjectId)) + if (GetBattlePyramidTrainerFlag(objectEventId)) return 0; } else if (InTrainerHill() == TRUE) { - if (GetHillTrainerFlag(eventObjectId)) + if (GetHillTrainerFlag(objectEventId)) return 0; } else @@ -256,7 +256,7 @@ static u8 CheckTrainer(u8 eventObjectId) return 0; } - approachDistance = GetTrainerApproachDistance(&gEventObjects[eventObjectId]); + approachDistance = GetTrainerApproachDistance(&gObjectEvents[objectEventId]); if (approachDistance != 0) { @@ -270,10 +270,10 @@ static u8 CheckTrainer(u8 eventObjectId) ret = 2; } - gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId = eventObjectId; + gApproachingTrainers[gNoOfApproachingTrainers].objectEventId = objectEventId; gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr; gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance; - TrainerApproachPlayer(&gEventObjects[eventObjectId], approachDistance - 1); + TrainerApproachPlayer(&gObjectEvents[objectEventId], approachDistance - 1); gNoOfApproachingTrainers++; return ret; @@ -282,7 +282,7 @@ static u8 CheckTrainer(u8 eventObjectId) return 0; } -static u8 GetTrainerApproachDistance(struct EventObject *trainerObj) +static u8 GetTrainerApproachDistance(struct ObjectEvent *trainerObj) { s16 x, y; u8 i; @@ -308,7 +308,7 @@ static u8 GetTrainerApproachDistance(struct EventObject *trainerObj) } // Returns how far south the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.x == x && y > trainerObj->currentCoords.y @@ -319,7 +319,7 @@ static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 ra } // Returns how far north the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.x == x && y < trainerObj->currentCoords.y @@ -330,7 +330,7 @@ static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 ra } // Returns how far west the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.y == y && x < trainerObj->currentCoords.x @@ -341,7 +341,7 @@ static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 ran } // Returns how far east the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.y == y && x > trainerObj->currentCoords.x @@ -353,7 +353,7 @@ static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 ran #define COLLISION_MASK (~1) -static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction) +static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction) { s16 x, y; u8 unk19_temp; @@ -394,16 +394,16 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 ap #define tFuncId data[0] #define tTrainerRange data[3] #define tOutOfAshSpriteId data[4] -#define tTrainerEventObjectId data[7] +#define tTrainerObjectEventId data[7] -static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range) +static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range) { struct Task *task; gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50); task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId]; task->tTrainerRange = range; - task->tTrainerEventObjectId = gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId; + task->tTrainerObjectEventId = gApproachingTrainers[gNoOfApproachingTrainers].objectEventId; } static void sub_80B40C8(TaskFunc followupFunc) @@ -425,7 +425,7 @@ static void sub_80B40C8(TaskFunc followupFunc) static void Task_RunTrainerSeeFuncList(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct EventObject *trainerObj = &gEventObjects[task->tTrainerEventObjectId]; + struct ObjectEvent *trainerObj = &gObjectEvents[task->tTrainerObjectEventId]; if (!trainerObj->active) { @@ -437,24 +437,24 @@ static void Task_RunTrainerSeeFuncList(u8 taskId) } } -static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80B4178(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { return FALSE; } -static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { u8 direction; - EventObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); direction = GetFaceDirectionMovementAction(trainerObj->facingDirection); - EventObjectSetHeldMovement(trainerObj, direction); + ObjectEventSetHeldMovement(trainerObj, direction); task->tFuncId++; return TRUE; } -static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) { @@ -471,88 +471,88 @@ static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct Eve } } -static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj)) { if (task->tTrainerRange) { - EventObjectSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); + ObjectEventSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); task->tTrainerRange--; } else { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->tFuncId++; } } return FALSE; } -static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - struct EventObject *playerObj; + struct ObjectEvent *playerObj; - if (EventObjectIsMovementOverridden(trainerObj) && !EventObjectClearHeldMovementIfFinished(trainerObj)) + if (ObjectEventIsMovementOverridden(trainerObj) && !ObjectEventClearHeldMovementIfFinished(trainerObj)) return FALSE; SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - TryOverrideTemplateCoordsForEventObject(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - OverrideTemplateCoordsForEventObject(trainerObj); + TryOverrideTemplateCoordsForObjectEvent(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); + OverrideTemplateCoordsForObjectEvent(trainerObj); - playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectIsMovementOverridden(playerObj) && !EventObjectClearHeldMovementIfFinished(playerObj)) + playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventIsMovementOverridden(playerObj) && !ObjectEventClearHeldMovementIfFinished(playerObj)) return FALSE; sub_808BCE8(); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); task->tFuncId++; return FALSE; } -static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!EventObjectIsMovementOverridden(playerObj) - || EventObjectClearHeldMovementIfFinished(playerObj)) + if (!ObjectEventIsMovementOverridden(playerObj) + || ObjectEventClearHeldMovementIfFinished(playerObj)) SwitchTaskToFollowupFunc(taskId); return FALSE; } -static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) - || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) + || ObjectEventClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); task->tFuncId++; } return FALSE; } -static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (EventObjectClearHeldMovementIfFinished(trainerObj)) + if (ObjectEventClearHeldMovementIfFinished(trainerObj)) task->tFuncId = 3; return FALSE; } -static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) - || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) + || ObjectEventClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->tFuncId++; } return FALSE; } -static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (EventObjectCheckHeldMovementStatus(trainerObj)) + if (ObjectEventCheckHeldMovementStatus(trainerObj)) { gFieldEffectArguments[0] = trainerObj->currentCoords.x; gFieldEffectArguments[1] = trainerObj->currentCoords.y; @@ -564,7 +564,7 @@ static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct Event return FALSE; } -static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { struct Sprite *sprite; @@ -575,15 +575,15 @@ static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct Event sprite = &gSprites[trainerObj->spriteId]; sprite->oam.priority = 2; - EventObjectClearHeldMovementIfFinished(trainerObj); - EventObjectSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); + ObjectEventClearHeldMovementIfFinished(trainerObj); + ObjectEventSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); task->tFuncId++; } return FALSE; } -static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) task->tFuncId = 3; @@ -594,34 +594,34 @@ static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventO #undef tFuncId #undef tTrainerRange #undef tOutOfAshSpriteId -#undef tTrainerEventObjectId +#undef tTrainerObjectEventId static void sub_80B44C8(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct EventObject *eventObj; + struct ObjectEvent *objEvent; - // another eventObj loaded into by loadword? - LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&eventObj); + // another objEvent loaded into by loadword? + LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&objEvent); if (!task->data[7]) { - EventObjectClearHeldMovement(eventObj); + ObjectEventClearHeldMovement(objEvent); task->data[7]++; } - sTrainerSeeFuncList2[task->data[0]](taskId, task, eventObj); + sTrainerSeeFuncList2[task->data[0]](taskId, task, objEvent); if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { - SetTrainerMovementType(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); - TryOverrideTemplateCoordsForEventObject(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); + SetTrainerMovementType(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection)); + TryOverrideTemplateCoordsForObjectEvent(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection)); DestroyTask(taskId); } else { - eventObj->heldMovementFinished = 0; + objEvent->heldMovementFinished = 0; } } -void sub_80B4578(struct EventObject *var) +void sub_80B4578(struct ObjectEvent *var) { StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var); } @@ -645,8 +645,8 @@ void TryPrepareSecondApproachingTrainer(void) { gApproachingTrainerId++; gSpecialVar_Result = TRUE; - UnfreezeEventObjects(); - FreezeEventObjectsExceptOne(gApproachingTrainers[1].eventObjectId); + UnfreezeObjectEvents(); + FreezeObjectEventsExceptOne(gApproachingTrainers[1].objectEventId); } else { @@ -718,21 +718,21 @@ static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnim static void SpriteCB_TrainerIcons(struct Sprite *sprite) { - u8 eventObjId; + u8 objEventId; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &eventObjId) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &objEventId) || sprite->animEnded) { FieldEffectStop(sprite, sprite->sFldEffId); } else { - struct Sprite *eventObjSprite = &gSprites[gEventObjects[eventObjId].spriteId]; + struct Sprite *objEventSprite = &gSprites[gObjectEvents[objEventId].spriteId]; sprite->sData4 += sprite->sData3; - sprite->pos1.x = eventObjSprite->pos1.x; - sprite->pos1.y = eventObjSprite->pos1.y - 16; - sprite->pos2.x = eventObjSprite->pos2.x; - sprite->pos2.y = eventObjSprite->pos2.y + sprite->sData4; + sprite->pos1.x = objEventSprite->pos1.x; + sprite->pos1.y = objEventSprite->pos1.y - 16; + sprite->pos2.x = objEventSprite->pos2.x; + sprite->pos2.y = objEventSprite->pos2.y + sprite->sData4; if (sprite->sData4) sprite->sData3++; else @@ -747,39 +747,39 @@ static void SpriteCB_TrainerIcons(struct Sprite *sprite) #undef sData4 #undef sFldEffId -u8 GetCurrentApproachingTrainerEventObjectId(void) +u8 GetCurrentApproachingTrainerObjectEventId(void) { if (gApproachingTrainerId == 0) - return gApproachingTrainers[0].eventObjectId; + return gApproachingTrainers[0].objectEventId; else - return gApproachingTrainers[1].eventObjectId; + return gApproachingTrainers[1].objectEventId; } -u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId) +u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId) { if (arrayId >= ARRAY_COUNT(gApproachingTrainers)) return 0; else if (arrayId == 0) - return gApproachingTrainers[0].eventObjectId; + return gApproachingTrainers[0].objectEventId; else - return gApproachingTrainers[1].eventObjectId; + return gApproachingTrainers[1].objectEventId; } void PlayerFaceTrainerAfterBattle(void) { - struct EventObject *eventObj; + struct ObjectEvent *objEvent; if (gTrainerApproachedPlayer == TRUE) { - eventObj = &gEventObjects[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].eventObjectId]; - gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(eventObj->facingDirection)); + objEvent = &gObjectEvents[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].objectEventId]; + gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(objEvent->facingDirection)); gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); } else { - eventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(eventObj->facingDirection); + objEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(objEvent->facingDirection); gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); } diff --git a/src/tv.c b/src/tv.c index c810855518..a77f42a759 100644 --- a/src/tv.c +++ b/src/tv.c @@ -1034,7 +1034,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void) return 0; } -void GabbyAndTySetScriptVarsToEventObjectLocalIds(void) +void GabbyAndTySetScriptVarsToObjectEventLocalIds(void) { switch (GabbyAndTyGetBattleNum()) { @@ -3593,7 +3593,7 @@ void GetMomOrDadStringForTVMessage(void) void sub_80F01B8(void) { VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0); - RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(FLAG_HIDE_BATTLE_TOWER_REPORTER); } diff --git a/src/union_room.c b/src/union_room.c index d6b7125581..f71120e598 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -4249,7 +4249,7 @@ void sub_801818C(bool32 arg0) void sub_80181CC(void) { ScriptContext2_Enable(); - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); } u8 sub_80181DC(struct UnkStruct_URoom *arg0) diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c index 0b7324366c..2fadad6bd4 100644 --- a/src/union_room_player_avatar.c +++ b/src/union_room_player_avatar.c @@ -124,30 +124,30 @@ static void SetUnionRoomPlayerGfx(u32 playerIdx, u32 gfxId) VarSet(VAR_OBJ_GFX_ID_0 + playerIdx, gfxId); } -static void CreateUnionRoomPlayerEventObject(u32 playerIdx) +static void CreateUnionRoomPlayerObjectEvent(u32 playerIdx) { - TrySpawnEventObject(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } -static void RemoveUnionRoomPlayerEventObject(u32 playerIdx) +static void RemoveUnionRoomPlayerObjectEvent(u32 playerIdx) { - RemoveEventObjectByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * movement) { u8 objectId; - struct EventObject * object; - if (TryGetEventObjectIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) + struct ObjectEvent * object; + if (TryGetObjectEventIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) { return FALSE; } - object = &gEventObjects[objectId]; - if (EventObjectIsMovementOverridden(object)) + object = &gObjectEvents[objectId]; + if (ObjectEventIsMovementOverridden(object)) { return FALSE; } - if (EventObjectSetHeldMovement(object, *movement)) + if (ObjectEventSetHeldMovement(object, *movement)) { return FALSE; } @@ -157,23 +157,23 @@ static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * move static bool32 sub_8019B3C(u32 playerIdx) { u8 objectId; - struct EventObject * object; - if (TryGetEventObjectIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) + struct ObjectEvent * object; + if (TryGetObjectEventIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) { return TRUE; } - object = &gEventObjects[objectId]; - if (!EventObjectClearHeldMovementIfFinished(object)) + object = &gObjectEvents[objectId]; + if (!ObjectEventClearHeldMovementIfFinished(object)) { return FALSE; } if (!ScriptContext2_IsEnabled()) { - UnfreezeEventObject(object); + UnfreezeObjectEvent(object); } else { - FreezeEventObject(object); + FreezeObjectEvent(object); } return TRUE; } @@ -208,7 +208,7 @@ static bool32 sub_8019BDC(s8 * a0, u32 playerIdx, struct UnkStruct_8019BA8 * ptr case 1: if (sub_8019B3C(playerIdx)) { - RemoveUnionRoomPlayerEventObject(playerIdx); + RemoveUnionRoomPlayerObjectEvent(playerIdx); HideUnionRoomPlayer(playerIdx); *a0 = 0; return TRUE; @@ -240,7 +240,7 @@ static bool32 sub_8019C38(s8 * a0, u32 playerIdx, struct UnkStruct_8019BA8 * ptr break; } SetUnionRoomPlayerGfx(playerIdx, ptr->field_1); - CreateUnionRoomPlayerEventObject(playerIdx); + CreateUnionRoomPlayerObjectEvent(playerIdx); ShowUnionRoomPlayer(playerIdx); (*a0)++; // fallthrough @@ -310,7 +310,7 @@ static void sub_8019D44(u32 playerIdx, struct UnkStruct_8019BA8 * ptr) { ptr->field_0 = 0; ptr->field_2 = 0; - RemoveUnionRoomPlayerEventObject(playerIdx); + RemoveUnionRoomPlayerObjectEvent(playerIdx); HideUnionRoomPlayer(playerIdx); } else if (sub_8019C38(&ptr->field_2, playerIdx, ptr) == 1) @@ -376,7 +376,7 @@ void sub_8019E3C(void) { if (!IsUnionRoomPlayerHidden(i)) { - RemoveUnionRoomPlayerEventObject(i); + RemoveUnionRoomPlayerObjectEvent(i); HideUnionRoomPlayer(i); } } diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 1cf196fda6..baa93233b7 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -149,7 +149,7 @@ string generate_map_events_text(Json map_data) { string objects_label, warps_label, coords_label, bgs_label; if (map_data["object_events"].array_items().size() > 0) { - objects_label = map_data["name"].string_value() + "_EventObjects"; + objects_label = map_data["name"].string_value() + "_ObjectEvents"; text << objects_label << ":\n"; for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { auto obj_event = map_data["object_events"].array_items()[i]; From 82cb741d8b2b2d88c1e23d2d5ccf5443892538fa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 20 Nov 2019 23:12:51 -0500 Subject: [PATCH 02/13] Standardize EVENT_OBJECT to OBJECT_EVENT --- common_syms/faraway_island.txt | 2 +- data/event_scripts.s | 4 +- .../AbandonedShip_CaptainsOffice/map.json | 4 +- data/maps/AbandonedShip_Corridors_1F/map.json | 4 +- .../maps/AbandonedShip_Corridors_B1F/map.json | 4 +- .../AbandonedShip_HiddenFloorRooms/map.json | 8 +- data/maps/AbandonedShip_Room_B1F/map.json | 2 +- data/maps/AbandonedShip_Rooms2_1F/map.json | 10 +- data/maps/AbandonedShip_Rooms2_B1F/map.json | 4 +- data/maps/AbandonedShip_Rooms_1F/map.json | 8 +- data/maps/AbandonedShip_Rooms_B1F/map.json | 4 +- data/maps/AncientTomb/map.json | 2 +- data/maps/AquaHideout_1F/map.json | 6 +- data/maps/AquaHideout_B1F/map.json | 18 +- data/maps/AquaHideout_B2F/map.json | 12 +- data/maps/ArtisanCave_1F/map.json | 2 +- data/maps/ArtisanCave_B1F/map.json | 2 +- data/maps/BattleColosseum2P/map.json | 2 +- .../map.json | 18 +- .../scripts.inc | 6 +- .../map.json | 2 +- .../scripts.inc | 4 +- .../BattleFrontier_BattleArenaLobby/map.json | 10 +- .../scripts.inc | 10 +- .../map.json | 30 +- .../scripts.inc | 134 ++--- .../map.json | 2 +- .../scripts.inc | 8 +- .../BattleFrontier_BattleDomeLobby/map.json | 12 +- .../scripts.inc | 6 +- .../map.json | 2 +- .../scripts.inc | 8 +- .../map.json | 16 +- .../scripts.inc | 10 +- .../map.json | 12 +- .../scripts.inc | 4 +- .../map.json | 2 +- .../scripts.inc | 8 +- .../map.json | 10 +- .../scripts.inc | 10 +- .../map.json | 14 +- .../scripts.inc | 10 +- .../BattleFrontier_BattlePalaceLobby/map.json | 12 +- .../scripts.inc | 6 +- .../map.json | 2 +- .../scripts.inc | 6 +- .../BattleFrontier_BattlePikeLobby/map.json | 8 +- .../scripts.inc | 4 +- .../map.json | 4 +- .../scripts.inc | 14 +- .../map.json | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../map.json | 4 +- .../scripts.inc | 2 +- .../map.json | 32 +- .../map.json | 8 +- .../scripts.inc | 6 +- .../BattleFrontier_BattlePyramidTop/map.json | 4 +- .../scripts.inc | 8 +- .../map.json | 6 +- .../scripts.inc | 10 +- .../map.json | 12 +- .../scripts.inc | 6 +- .../map.json | 2 +- .../scripts.inc | 4 +- .../map.json | 8 +- .../scripts.inc | 6 +- .../map.json | 2 +- .../scripts.inc | 6 +- .../BattleFrontier_BattleTowerLobby/map.json | 18 +- .../scripts.inc | 6 +- .../map.json | 18 +- .../scripts.inc | 28 +- .../map.json | 18 +- data/maps/BattleFrontier_Lounge1/map.json | 6 +- data/maps/BattleFrontier_Lounge2/map.json | 10 +- data/maps/BattleFrontier_Lounge3/map.json | 10 +- data/maps/BattleFrontier_Lounge4/map.json | 6 +- data/maps/BattleFrontier_Lounge5/map.json | 8 +- data/maps/BattleFrontier_Lounge6/map.json | 2 +- data/maps/BattleFrontier_Lounge7/map.json | 8 +- data/maps/BattleFrontier_Lounge8/map.json | 6 +- data/maps/BattleFrontier_Lounge9/map.json | 2 +- data/maps/BattleFrontier_Mart/map.json | 8 +- data/maps/BattleFrontier_OutsideEast/map.json | 52 +- data/maps/BattleFrontier_OutsideWest/map.json | 48 +- .../BattleFrontier_PokemonCenter_1F/map.json | 10 +- .../BattleFrontier_PokemonCenter_2F/map.json | 8 +- data/maps/BattleFrontier_RankingHall/map.json | 6 +- .../BattleFrontier_ReceptionGate/map.json | 10 +- .../BattleFrontier_ReceptionGate/scripts.inc | 8 +- data/maps/BattleFrontier_ScottsHouse/map.json | 2 +- data/maps/BattlePyramidSquare01/map.json | 14 +- data/maps/BattlePyramidSquare02/map.json | 14 +- data/maps/BattlePyramidSquare03/map.json | 14 +- data/maps/BattlePyramidSquare04/map.json | 14 +- data/maps/BattlePyramidSquare05/map.json | 14 +- data/maps/BattlePyramidSquare06/map.json | 14 +- data/maps/BattlePyramidSquare07/map.json | 14 +- data/maps/BattlePyramidSquare08/map.json | 14 +- data/maps/BattlePyramidSquare09/map.json | 14 +- data/maps/BattlePyramidSquare10/map.json | 14 +- data/maps/BattlePyramidSquare11/map.json | 14 +- data/maps/BattlePyramidSquare12/map.json | 14 +- data/maps/BattlePyramidSquare13/map.json | 14 +- data/maps/BattlePyramidSquare14/map.json | 14 +- data/maps/BattlePyramidSquare15/map.json | 14 +- data/maps/BattlePyramidSquare16/map.json | 14 +- data/maps/BirthIsland_Exterior/map.json | 4 +- data/maps/BirthIsland_Exterior/scripts.inc | 2 +- data/maps/BirthIsland_Harbor/map.json | 4 +- data/maps/CaveOfOrigin_B1F/map.json | 2 +- data/maps/ContestHall/map.json | 30 +- data/maps/ContestHall/scripts.inc | 228 ++++---- data/maps/DesertRuins/map.json | 2 +- data/maps/DesertUnderpass/map.json | 2 +- data/maps/DewfordTown/map.json | 10 +- data/maps/DewfordTown/scripts.inc | 30 +- data/maps/DewfordTown_Gym/map.json | 16 +- data/maps/DewfordTown_Hall/map.json | 18 +- data/maps/DewfordTown_Hall/scripts.inc | 8 +- data/maps/DewfordTown_House1/map.json | 6 +- data/maps/DewfordTown_House2/map.json | 4 +- .../DewfordTown_PokemonCenter_1F/map.json | 6 +- .../DewfordTown_PokemonCenter_2F/map.json | 8 +- .../EverGrandeCity_ChampionsRoom/map.json | 6 +- .../EverGrandeCity_ChampionsRoom/scripts.inc | 16 +- data/maps/EverGrandeCity_DrakesRoom/map.json | 2 +- .../EverGrandeCity_DrakesRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/map.json | 2 +- .../EverGrandeCity_GlaciasRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_Hall1/scripts.inc | 2 +- data/maps/EverGrandeCity_Hall2/scripts.inc | 2 +- data/maps/EverGrandeCity_Hall3/scripts.inc | 2 +- data/maps/EverGrandeCity_Hall4/scripts.inc | 2 +- data/maps/EverGrandeCity_Hall5/scripts.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/map.json | 2 +- .../EverGrandeCity_HallOfFame/scripts.inc | 12 +- data/maps/EverGrandeCity_PhoebesRoom/map.json | 2 +- .../EverGrandeCity_PhoebesRoom/scripts.inc | 2 +- .../EverGrandeCity_PokemonCenter_1F/map.json | 8 +- .../EverGrandeCity_PokemonCenter_2F/map.json | 8 +- .../EverGrandeCity_PokemonLeague_1F/map.json | 8 +- .../scripts.inc | 4 +- .../EverGrandeCity_PokemonLeague_2F/map.json | 8 +- data/maps/EverGrandeCity_SidneysRoom/map.json | 2 +- .../EverGrandeCity_SidneysRoom/scripts.inc | 2 +- data/maps/FallarborTown/map.json | 8 +- .../map.json | 6 +- .../scripts.inc | 10 +- .../FallarborTown_BattleTentCorridor/map.json | 2 +- .../scripts.inc | 4 +- .../FallarborTown_BattleTentLobby/map.json | 10 +- .../FallarborTown_BattleTentLobby/scripts.inc | 6 +- data/maps/FallarborTown_CozmosHouse/map.json | 4 +- data/maps/FallarborTown_Mart/map.json | 10 +- .../map.json | 2 +- .../FallarborTown_PokemonCenter_1F/map.json | 8 +- .../FallarborTown_PokemonCenter_2F/map.json | 8 +- data/maps/FarawayIsland_Entrance/map.json | 4 +- data/maps/FarawayIsland_Interior/map.json | 2 +- data/maps/FieryPath/map.json | 16 +- data/maps/FortreeCity/map.json | 14 +- data/maps/FortreeCity_DecorationShop/map.json | 8 +- data/maps/FortreeCity_Gym/map.json | 16 +- data/maps/FortreeCity_House1/map.json | 6 +- data/maps/FortreeCity_House2/map.json | 4 +- data/maps/FortreeCity_House3/map.json | 4 +- data/maps/FortreeCity_House4/map.json | 6 +- data/maps/FortreeCity_House5/map.json | 6 +- data/maps/FortreeCity_Mart/map.json | 8 +- .../FortreeCity_PokemonCenter_1F/map.json | 8 +- .../FortreeCity_PokemonCenter_2F/map.json | 8 +- data/maps/GraniteCave_1F/map.json | 4 +- data/maps/GraniteCave_B1F/map.json | 2 +- data/maps/GraniteCave_B2F/map.json | 18 +- data/maps/GraniteCave_StevensRoom/map.json | 2 +- data/maps/GraniteCave_StevensRoom/scripts.inc | 4 +- data/maps/InsideOfTruck/map.json | 6 +- data/maps/IslandCave/map.json | 2 +- data/maps/JaggedPass/map.json | 14 +- data/maps/LavaridgeTown/map.json | 18 +- data/maps/LavaridgeTown/scripts.inc | 4 +- data/maps/LavaridgeTown_Gym_1F/map.json | 12 +- data/maps/LavaridgeTown_Gym_B1F/map.json | 8 +- data/maps/LavaridgeTown_HerbShop/map.json | 6 +- data/maps/LavaridgeTown_House/map.json | 6 +- data/maps/LavaridgeTown_Mart/map.json | 6 +- .../LavaridgeTown_PokemonCenter_1F/map.json | 8 +- .../LavaridgeTown_PokemonCenter_2F/map.json | 8 +- data/maps/LilycoveCity/map.json | 44 +- data/maps/LilycoveCity_ContestHall/map.json | 64 +-- data/maps/LilycoveCity_ContestLobby/map.json | 50 +- .../LilycoveCity_ContestLobby/scripts.inc | 12 +- .../LilycoveCity_CoveLilyMotel_1F/map.json | 2 +- .../LilycoveCity_CoveLilyMotel_1F/scripts.inc | 4 +- .../LilycoveCity_CoveLilyMotel_2F/map.json | 14 +- .../map.json | 2 +- .../map.json | 8 +- .../LilycoveCity_DepartmentStore_1F/map.json | 12 +- .../LilycoveCity_DepartmentStore_2F/map.json | 10 +- .../LilycoveCity_DepartmentStore_3F/map.json | 10 +- .../LilycoveCity_DepartmentStore_4F/map.json | 10 +- .../LilycoveCity_DepartmentStore_5F/map.json | 14 +- data/maps/LilycoveCity_Harbor/map.json | 10 +- data/maps/LilycoveCity_Harbor/scripts.inc | 12 +- data/maps/LilycoveCity_House1/map.json | 4 +- data/maps/LilycoveCity_House2/map.json | 2 +- data/maps/LilycoveCity_House3/map.json | 12 +- data/maps/LilycoveCity_House4/map.json | 4 +- .../LilycoveCity_LilycoveMuseum_1F/map.json | 20 +- .../scripts.inc | 6 +- .../LilycoveCity_LilycoveMuseum_2F/map.json | 8 +- .../scripts.inc | 6 +- .../LilycoveCity_MoveDeletersHouse/map.json | 2 +- .../LilycoveCity_PokemonCenter_1F/map.json | 10 +- .../LilycoveCity_PokemonCenter_2F/map.json | 8 +- .../map.json | 18 +- .../scripts.inc | 4 +- data/maps/LittlerootTown/map.json | 16 +- data/maps/LittlerootTown/scripts.inc | 32 +- .../LittlerootTown_BrendansHouse_1F/map.json | 14 +- .../scripts.inc | 12 +- .../LittlerootTown_BrendansHouse_2F/map.json | 32 +- .../scripts.inc | 14 +- .../maps/LittlerootTown_MaysHouse_1F/map.json | 14 +- .../LittlerootTown_MaysHouse_1F/scripts.inc | 12 +- .../maps/LittlerootTown_MaysHouse_2F/map.json | 32 +- .../LittlerootTown_MaysHouse_2F/scripts.inc | 14 +- .../map.json | 12 +- .../scripts.inc | 14 +- data/maps/MagmaHideout_1F/map.json | 12 +- data/maps/MagmaHideout_2F_1R/map.json | 8 +- data/maps/MagmaHideout_2F_2R/map.json | 12 +- data/maps/MagmaHideout_3F_1R/map.json | 6 +- data/maps/MagmaHideout_3F_2R/map.json | 4 +- data/maps/MagmaHideout_3F_3R/map.json | 2 +- data/maps/MagmaHideout_4F/map.json | 16 +- data/maps/MagmaHideout_4F/scripts.inc | 4 +- data/maps/MarineCave_End/map.json | 2 +- data/maps/MarineCave_End/scripts.inc | 2 +- data/maps/MauvilleCity/map.json | 22 +- data/maps/MauvilleCity/scripts.inc | 16 +- data/maps/MauvilleCity_BikeShop/map.json | 4 +- data/maps/MauvilleCity_GameCorner/map.json | 24 +- data/maps/MauvilleCity_Gym/map.json | 14 +- data/maps/MauvilleCity_House1/map.json | 2 +- data/maps/MauvilleCity_House2/map.json | 2 +- data/maps/MauvilleCity_Mart/map.json | 6 +- .../MauvilleCity_PokemonCenter_1F/map.json | 10 +- .../MauvilleCity_PokemonCenter_2F/map.json | 10 +- data/maps/MeteorFalls_1F_1R/map.json | 20 +- data/maps/MeteorFalls_1F_1R/scripts.inc | 6 +- data/maps/MeteorFalls_1F_2R/map.json | 6 +- data/maps/MeteorFalls_B1F_2R/map.json | 2 +- data/maps/MeteorFalls_StevensCave/map.json | 2 +- data/maps/MirageTower_3F/map.json | 4 +- data/maps/MirageTower_4F/map.json | 6 +- data/maps/MossdeepCity/map.json | 34 +- data/maps/MossdeepCity/scripts.inc | 4 +- data/maps/MossdeepCity_GameCorner_1F/map.json | 4 +- .../maps/MossdeepCity_GameCorner_B1F/map.json | 2 +- data/maps/MossdeepCity_Gym/map.json | 72 +-- data/maps/MossdeepCity_Gym/scripts.inc | 16 +- data/maps/MossdeepCity_House1/map.json | 4 +- data/maps/MossdeepCity_House2/map.json | 6 +- data/maps/MossdeepCity_House3/map.json | 2 +- data/maps/MossdeepCity_House4/map.json | 6 +- data/maps/MossdeepCity_Mart/map.json | 8 +- .../MossdeepCity_PokemonCenter_1F/map.json | 6 +- .../MossdeepCity_PokemonCenter_2F/map.json | 10 +- .../maps/MossdeepCity_SpaceCenter_1F/map.json | 22 +- .../maps/MossdeepCity_SpaceCenter_2F/map.json | 18 +- .../MossdeepCity_SpaceCenter_2F/scripts.inc | 10 +- data/maps/MossdeepCity_StevensHouse/map.json | 6 +- data/maps/MtChimney/map.json | 60 +- data/maps/MtChimney/scripts.inc | 2 +- data/maps/MtChimney_CableCarStation/map.json | 4 +- .../MtChimney_CableCarStation/scripts.inc | 4 +- data/maps/MtPyre_1F/map.json | 6 +- data/maps/MtPyre_2F/map.json | 16 +- data/maps/MtPyre_3F/map.json | 8 +- data/maps/MtPyre_4F/map.json | 4 +- data/maps/MtPyre_5F/map.json | 4 +- data/maps/MtPyre_6F/map.json | 6 +- data/maps/MtPyre_Exterior/map.json | 4 +- data/maps/MtPyre_Summit/map.json | 16 +- data/maps/MtPyre_Summit/scripts.inc | 26 +- data/maps/NavelRock_Bottom/map.json | 2 +- data/maps/NavelRock_Harbor/map.json | 4 +- data/maps/NavelRock_Top/map.json | 2 +- data/maps/NavelRock_Top/scripts.inc | 4 +- data/maps/NewMauville_Entrance/scripts.inc | 2 +- data/maps/NewMauville_Inside/map.json | 16 +- data/maps/OldaleTown/map.json | 8 +- data/maps/OldaleTown/scripts.inc | 16 +- data/maps/OldaleTown_House1/map.json | 2 +- data/maps/OldaleTown_House2/map.json | 4 +- data/maps/OldaleTown_Mart/map.json | 6 +- .../maps/OldaleTown_PokemonCenter_1F/map.json | 8 +- .../maps/OldaleTown_PokemonCenter_2F/map.json | 8 +- data/maps/PacifidlogTown/map.json | 6 +- data/maps/PacifidlogTown_House1/map.json | 4 +- data/maps/PacifidlogTown_House2/map.json | 6 +- data/maps/PacifidlogTown_House3/map.json | 4 +- data/maps/PacifidlogTown_House4/map.json | 6 +- data/maps/PacifidlogTown_House5/map.json | 4 +- .../PacifidlogTown_PokemonCenter_1F/map.json | 10 +- .../PacifidlogTown_PokemonCenter_2F/map.json | 8 +- data/maps/PetalburgCity/map.json | 18 +- data/maps/PetalburgCity/scripts.inc | 34 +- data/maps/PetalburgCity_Gym/map.json | 22 +- data/maps/PetalburgCity_Gym/scripts.inc | 36 +- data/maps/PetalburgCity_House1/map.json | 4 +- data/maps/PetalburgCity_House2/map.json | 4 +- data/maps/PetalburgCity_Mart/map.json | 8 +- .../PetalburgCity_PokemonCenter_1F/map.json | 10 +- .../PetalburgCity_PokemonCenter_2F/map.json | 8 +- data/maps/PetalburgCity_WallysHouse/map.json | 4 +- .../PetalburgCity_WallysHouse/scripts.inc | 2 +- data/maps/PetalburgWoods/map.json | 26 +- data/maps/PetalburgWoods/scripts.inc | 10 +- data/maps/RecordCorner/map.json | 2 +- data/maps/Route101/map.json | 12 +- data/maps/Route101/scripts.inc | 12 +- data/maps/Route102/map.json | 18 +- data/maps/Route103/map.json | 40 +- data/maps/Route103/scripts.inc | 4 +- data/maps/Route104/map.json | 68 +-- data/maps/Route104/scripts.inc | 28 +- data/maps/Route104_MrBrineysHouse/map.json | 4 +- .../Route104_PrettyPetalFlowerShop/map.json | 6 +- data/maps/Route105/map.json | 16 +- data/maps/Route106/map.json | 10 +- data/maps/Route107/map.json | 14 +- data/maps/Route108/map.json | 14 +- data/maps/Route109/map.json | 48 +- data/maps/Route109/scripts.inc | 18 +- data/maps/Route109_SeashoreHouse/map.json | 8 +- data/maps/Route110/map.json | 72 +-- .../map.json | 2 +- .../scripts.inc | 2 +- .../map.json | 2 +- .../scripts.inc | 2 +- data/maps/Route110_TrickHouseEnd/map.json | 2 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 4 +- .../maps/Route110_TrickHouseEntrance/map.json | 2 +- .../Route110_TrickHouseEntrance/scripts.inc | 10 +- data/maps/Route110_TrickHousePuzzle1/map.json | 30 +- data/maps/Route110_TrickHousePuzzle2/map.json | 10 +- data/maps/Route110_TrickHousePuzzle3/map.json | 14 +- data/maps/Route110_TrickHousePuzzle4/map.json | 28 +- data/maps/Route110_TrickHousePuzzle5/map.json | 10 +- data/maps/Route110_TrickHousePuzzle6/map.json | 8 +- data/maps/Route110_TrickHousePuzzle7/map.json | 18 +- data/maps/Route110_TrickHousePuzzle8/map.json | 8 +- data/maps/Route111/map.json | 92 +-- data/maps/Route111/scripts.inc | 24 +- data/maps/Route111_OldLadysRestStop/map.json | 2 +- .../Route111_WinstrateFamilysHouse/map.json | 8 +- data/maps/Route112/map.json | 28 +- data/maps/Route112_CableCarStation/map.json | 4 +- .../maps/Route112_CableCarStation/scripts.inc | 4 +- data/maps/Route113/map.json | 32 +- data/maps/Route113_GlassWorkshop/map.json | 4 +- data/maps/Route114/map.json | 54 +- .../maps/Route114_FossilManiacsHouse/map.json | 2 +- .../Route114_FossilManiacsTunnel/map.json | 2 +- .../Route114_FossilManiacsTunnel/scripts.inc | 2 +- data/maps/Route114_LanettesHouse/map.json | 2 +- data/maps/Route115/map.json | 46 +- data/maps/Route116/map.json | 56 +- data/maps/Route116/scripts.inc | 2 +- .../maps/Route116_TunnelersRestHouse/map.json | 6 +- data/maps/Route117/map.json | 48 +- data/maps/Route117_PokemonDayCare/map.json | 2 +- data/maps/Route118/map.json | 42 +- data/maps/Route118/scripts.inc | 12 +- data/maps/Route119/map.json | 86 +-- data/maps/Route119/scripts.inc | 6 +- data/maps/Route119_House/map.json | 14 +- .../Route119_WeatherInstitute_1F/map.json | 10 +- .../Route119_WeatherInstitute_2F/map.json | 16 +- .../Route119_WeatherInstitute_2F/scripts.inc | 4 +- data/maps/Route120/map.json | 88 +-- data/maps/Route120/scripts.inc | 6 +- data/maps/Route121/map.json | 58 +- .../maps/Route121_SafariZoneEntrance/map.json | 6 +- .../Route121_SafariZoneEntrance/scripts.inc | 8 +- data/maps/Route123/map.json | 86 +-- data/maps/Route123_BerryMastersHouse/map.json | 4 +- data/maps/Route124/map.json | 24 +- .../map.json | 2 +- data/maps/Route125/map.json | 20 +- data/maps/Route126/map.json | 18 +- data/maps/Route127/map.json | 22 +- data/maps/Route128/map.json | 20 +- data/maps/Route128/scripts.inc | 8 +- data/maps/Route129/map.json | 10 +- data/maps/Route130/map.json | 8 +- data/maps/Route131/map.json | 16 +- data/maps/Route132/map.json | 20 +- data/maps/Route133/map.json | 20 +- data/maps/Route134/map.json | 22 +- data/maps/RustboroCity/map.json | 32 +- data/maps/RustboroCity/scripts.inc | 38 +- data/maps/RustboroCity_CuttersHouse/map.json | 4 +- data/maps/RustboroCity_DevonCorp_1F/map.json | 6 +- data/maps/RustboroCity_DevonCorp_2F/map.json | 12 +- data/maps/RustboroCity_DevonCorp_3F/map.json | 6 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 6 +- data/maps/RustboroCity_Flat1_1F/map.json | 4 +- data/maps/RustboroCity_Flat1_2F/map.json | 16 +- data/maps/RustboroCity_Flat2_1F/map.json | 4 +- data/maps/RustboroCity_Flat2_2F/map.json | 4 +- data/maps/RustboroCity_Flat2_3F/map.json | 4 +- data/maps/RustboroCity_Gym/map.json | 10 +- data/maps/RustboroCity_House1/map.json | 4 +- data/maps/RustboroCity_House2/map.json | 4 +- data/maps/RustboroCity_House3/map.json | 6 +- data/maps/RustboroCity_Mart/map.json | 8 +- .../RustboroCity_PokemonCenter_1F/map.json | 8 +- .../RustboroCity_PokemonCenter_2F/map.json | 8 +- data/maps/RustboroCity_PokemonSchool/map.json | 14 +- data/maps/RusturfTunnel/map.json | 20 +- data/maps/RusturfTunnel/scripts.inc | 16 +- data/maps/SSTidalCorridor/map.json | 10 +- data/maps/SSTidalCorridor/scripts.inc | 4 +- data/maps/SSTidalLowerDeck/map.json | 4 +- data/maps/SSTidalRooms/map.json | 16 +- data/maps/SafariZone_North/map.json | 18 +- data/maps/SafariZone_Northeast/map.json | 18 +- data/maps/SafariZone_Northwest/map.json | 4 +- data/maps/SafariZone_RestHouse/map.json | 6 +- data/maps/SafariZone_South/map.json | 12 +- data/maps/SafariZone_South/scripts.inc | 6 +- data/maps/SafariZone_Southeast/map.json | 10 +- data/maps/SafariZone_Southwest/map.json | 4 +- data/maps/ScorchedSlab/map.json | 2 +- data/maps/SeafloorCavern_Entrance/map.json | 2 +- data/maps/SeafloorCavern_Room1/map.json | 10 +- data/maps/SeafloorCavern_Room2/map.json | 16 +- data/maps/SeafloorCavern_Room3/map.json | 18 +- data/maps/SeafloorCavern_Room4/map.json | 4 +- data/maps/SeafloorCavern_Room5/map.json | 12 +- data/maps/SeafloorCavern_Room8/map.json | 24 +- data/maps/SeafloorCavern_Room9/map.json | 14 +- data/maps/SeafloorCavern_Room9/scripts.inc | 10 +- data/maps/SecretBase_BlueCave1/map.json | 30 +- data/maps/SecretBase_BlueCave2/map.json | 30 +- data/maps/SecretBase_BlueCave3/map.json | 30 +- data/maps/SecretBase_BlueCave4/map.json | 30 +- data/maps/SecretBase_BrownCave1/map.json | 30 +- data/maps/SecretBase_BrownCave2/map.json | 30 +- data/maps/SecretBase_BrownCave3/map.json | 30 +- data/maps/SecretBase_BrownCave4/map.json | 30 +- data/maps/SecretBase_RedCave1/map.json | 30 +- data/maps/SecretBase_RedCave2/map.json | 30 +- data/maps/SecretBase_RedCave3/map.json | 30 +- data/maps/SecretBase_RedCave4/map.json | 30 +- data/maps/SecretBase_Shrub1/map.json | 30 +- data/maps/SecretBase_Shrub2/map.json | 30 +- data/maps/SecretBase_Shrub3/map.json | 30 +- data/maps/SecretBase_Shrub4/map.json | 30 +- data/maps/SecretBase_Tree1/map.json | 30 +- data/maps/SecretBase_Tree2/map.json | 30 +- data/maps/SecretBase_Tree3/map.json | 30 +- data/maps/SecretBase_Tree4/map.json | 30 +- data/maps/SecretBase_YellowCave1/map.json | 30 +- data/maps/SecretBase_YellowCave2/map.json | 30 +- data/maps/SecretBase_YellowCave3/map.json | 30 +- data/maps/SecretBase_YellowCave4/map.json | 30 +- .../ShoalCave_LowTideEntranceRoom/map.json | 4 +- data/maps/ShoalCave_LowTideIceRoom/map.json | 4 +- data/maps/ShoalCave_LowTideInnerRoom/map.json | 2 +- data/maps/ShoalCave_LowTideLowerRoom/map.json | 4 +- .../maps/ShoalCave_LowTideStairsRoom/map.json | 2 +- data/maps/SkyPillar_Outside/map.json | 2 +- data/maps/SkyPillar_Outside/scripts.inc | 4 +- data/maps/SkyPillar_Top/map.json | 4 +- data/maps/SkyPillar_Top/scripts.inc | 6 +- data/maps/SlateportCity/map.json | 70 +-- data/maps/SlateportCity/scripts.inc | 12 +- .../map.json | 6 +- .../scripts.inc | 6 +- .../SlateportCity_BattleTentCorridor/map.json | 2 +- .../scripts.inc | 6 +- .../SlateportCity_BattleTentLobby/map.json | 10 +- .../SlateportCity_BattleTentLobby/scripts.inc | 6 +- data/maps/SlateportCity_Harbor/map.json | 16 +- data/maps/SlateportCity_Harbor/scripts.inc | 16 +- data/maps/SlateportCity_House/map.json | 4 +- data/maps/SlateportCity_Mart/map.json | 6 +- .../SlateportCity_NameRatersHouse/map.json | 2 +- .../SlateportCity_OceanicMuseum_1F/map.json | 28 +- .../scripts.inc | 12 +- .../SlateportCity_OceanicMuseum_2F/map.json | 14 +- .../scripts.inc | 8 +- .../SlateportCity_PokemonCenter_1F/map.json | 6 +- .../SlateportCity_PokemonCenter_2F/map.json | 8 +- .../SlateportCity_PokemonFanClub/map.json | 18 +- .../SlateportCity_SternsShipyard_1F/map.json | 8 +- .../SlateportCity_SternsShipyard_2F/map.json | 6 +- data/maps/SootopolisCity/map.json | 36 +- data/maps/SootopolisCity/scripts.inc | 32 +- data/maps/SootopolisCity_Gym_1F/map.json | 4 +- data/maps/SootopolisCity_Gym_1F/scripts.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/map.json | 20 +- data/maps/SootopolisCity_House1/map.json | 4 +- data/maps/SootopolisCity_House2/map.json | 2 +- data/maps/SootopolisCity_House3/map.json | 4 +- data/maps/SootopolisCity_House4/map.json | 6 +- data/maps/SootopolisCity_House5/map.json | 4 +- data/maps/SootopolisCity_House6/map.json | 2 +- data/maps/SootopolisCity_House7/map.json | 4 +- .../map.json | 4 +- data/maps/SootopolisCity_Mart/map.json | 6 +- .../map.json | 2 +- .../scripts.inc | 10 +- .../map.json | 2 +- .../scripts.inc | 4 +- .../SootopolisCity_PokemonCenter_1F/map.json | 8 +- .../SootopolisCity_PokemonCenter_2F/map.json | 8 +- data/maps/SouthernIsland_Exterior/map.json | 4 +- data/maps/SouthernIsland_Exterior/scripts.inc | 4 +- data/maps/SouthernIsland_Interior/map.json | 4 +- data/maps/SouthernIsland_Interior/scripts.inc | 12 +- data/maps/TerraCave_End/map.json | 2 +- data/maps/TerraCave_End/scripts.inc | 2 +- data/maps/TradeCenter/map.json | 2 +- data/maps/TrainerHill_Elevator/map.json | 2 +- data/maps/TrainerHill_Elevator/scripts.inc | 8 +- data/maps/TrainerHill_Entrance/map.json | 10 +- data/maps/TrainerHill_Entrance/scripts.inc | 20 +- data/maps/TrainerHill_Roof/map.json | 2 +- data/maps/Underwater_SeafloorCavern/map.json | 8 +- data/maps/UnionRoom/map.json | 18 +- data/maps/VerdanturfTown/map.json | 8 +- .../map.json | 6 +- .../scripts.inc | 10 +- .../map.json | 2 +- .../scripts.inc | 4 +- .../VerdanturfTown_BattleTentLobby/map.json | 12 +- .../scripts.inc | 6 +- .../map.json | 4 +- data/maps/VerdanturfTown_House/map.json | 4 +- data/maps/VerdanturfTown_Mart/map.json | 8 +- .../VerdanturfTown_PokemonCenter_1F/map.json | 8 +- .../VerdanturfTown_PokemonCenter_2F/map.json | 8 +- data/maps/VerdanturfTown_WandasHouse/map.json | 10 +- data/maps/VictoryRoad_1F/map.json | 18 +- data/maps/VictoryRoad_1F/scripts.inc | 2 +- data/maps/VictoryRoad_B1F/map.json | 42 +- data/maps/VictoryRoad_B2F/map.json | 14 +- data/scripts/battle_pike.inc | 18 +- data/scripts/cable_club.inc | 52 +- data/scripts/cave_hole.inc | 4 +- data/scripts/elite_four.inc | 4 +- data/scripts/players_house.inc | 46 +- data/scripts/rival_graphics.inc | 12 +- data/scripts/secret_base.inc | 2 +- include/constants/event_objects.h | 524 +++++++++--------- include/constants/global.h | 4 +- include/event_obj_lock.h | 6 +- include/event_object_movement.h | 8 +- include/global.fieldmap.h | 4 +- include/global.h | 4 +- include/shop.h | 2 +- src/battle_pike.c | 68 +-- src/battle_pyramid.c | 12 +- src/battle_tower.c | 110 ++-- src/berry.c | 2 +- src/bike.c | 8 +- src/cable_car.c | 12 +- src/contest.c | 4 +- src/data/contest_opponents.h | 192 +++---- src/data/decoration/tiles.h | 90 +-- .../event_object/berry_tree_graphics_tables.h | 4 +- .../event_object/event_object_graphics_info.h | 490 ++++++++-------- .../event_object_graphics_info_pointers.h | 478 ++++++++-------- src/data/lilycove_lady.h | 16 +- src/decoration.c | 10 +- src/easy_chat.c | 8 +- src/event_obj_lock.c | 4 +- src/event_object_movement.c | 468 ++++++++-------- src/faraway_island.c | 2 +- src/field_control_avatar.c | 6 +- src/field_effect_helpers.c | 8 +- src/field_player_avatar.c | 102 ++-- src/field_special_scene.c | 8 +- src/field_specials.c | 38 +- src/fldeff_cut.c | 2 +- src/fldeff_rocksmash.c | 2 +- src/fldeff_strength.c | 2 +- src/frontier_util.c | 14 +- src/item_use.c | 12 +- src/load_save.c | 4 +- src/match_call.c | 2 +- src/mauville_old_man.c | 2 +- src/naming_screen.c | 2 +- src/overworld.c | 6 +- src/rotating_tile_puzzle.c | 10 +- src/scrcmd.c | 4 +- src/script_movement.c | 18 +- src/script_pokemon_util_80F87D8.c | 4 +- src/secret_base.c | 22 +- src/shop.c | 10 +- src/trainer_hill.c | 2 +- src/trainer_see.c | 8 +- src/union_room_player_avatar.c | 2 +- 611 files changed, 4984 insertions(+), 4984 deletions(-) diff --git a/common_syms/faraway_island.txt b/common_syms/faraway_island.txt index 395c9a82fd..e02ca2ec25 100755 --- a/common_syms/faraway_island.txt +++ b/common_syms/faraway_island.txt @@ -1,3 +1,3 @@ sPlayerToMewDeltaX sPlayerToMewDeltaY -sMewDirectionCandidates \ No newline at end of file +sMewDirectionCandidates diff --git a/data/event_scripts.s b/data/event_scripts.s index 9bde704c9b..14f0b2be7c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -850,11 +850,11 @@ RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216 EventScript_UnusedBoardFerry:: @ 827222B delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Movement_UnusedBoardFerry + applymovement OBJ_EVENT_ID_PLAYER, Movement_UnusedBoardFerry waitmovement 0 delay 30 return diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 804fd0afc2..52615f6f3b 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 6, "elevation": 3, diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 60d8481ad0..305d14fe3e 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 17, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 5, "y": 10, "elevation": 3, diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 986ed6d4eb..ff45d98304 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 2, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 3f81080f18..00e128fb45 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 41, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 11, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 11, "elevation": 3, diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index e5b88f7b69..912f954f77 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index a24e2947aa..4c35de8046 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 7, "y": 13, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 13, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 3, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index be7dd5cddd..6dbcc98e4c 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 3, "elevation": 3, diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 0c325b4b72..06fb770fe4 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 11, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 10, "y": 16, "elevation": 3, diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index b8ccd9ee42..bd07334b3e 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 25, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 7, "elevation": 3, diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index fefcaaa98c..62c2f7a3ea 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGISTEEL", + "graphics_id": "OBJ_EVENT_GFX_REGISTEEL", "x": 8, "y": 7, "elevation": 3, diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index d873d332dd..1f34d5d506 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 13, "y": 11, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 14, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 20, "y": 4, "elevation": 3, diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index 3eff8d6fbf..bd47bd5527 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 28, "y": 16, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 12, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 20, "y": 18, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 9, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 10, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 10, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 28, "y": 21, "elevation": 3, diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index af4602595e..e9d99d90ba 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 23, "y": 19, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 23, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 13, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 19, "y": 20, "elevation": 1, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 7, "y": 5, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 13, "y": 5, "elevation": 3, diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json index 8f238a042c..855721fdad 100644 --- a/data/maps/ArtisanCave_1F/map.json +++ b/data/maps/ArtisanCave_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 5, "elevation": 3, diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json index 138ad35fed..f2147b7895 100644 --- a/data/maps/ArtisanCave_B1F/map.json +++ b/data/maps/ArtisanCave_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 38, "elevation": 3, diff --git a/data/maps/BattleColosseum2P/map.json b/data/maps/BattleColosseum2P/map.json index 04c2da1ecf..065ff9ebb7 100644 --- a/data/maps/BattleColosseum2P/map.json +++ b/data/maps/BattleColosseum2P/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json index 9bb2784963..b6c43b1675 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 4, "y": 5, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 15, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 6, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 6eb7e515b9..c598ec3d89 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -24,11 +24,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE return BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2 @@ -536,7 +536,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM removeobject 7 call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 setvar VAR_TEMP_1, 1 end diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json index 18bca93664..311fb807f1 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/map.json +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 9, "y": 12, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index cc362f5f04..28d128715d 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -10,14 +10,14 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 delay 16 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_257417 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_257417 waitmovement 0 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444 waitmovement 0 msgbox BattleFrontier_BattleArenaCorridor_Text_257449, MSGBOX_SIGN applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_25742C + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_25742C waitmovement 0 setvar VAR_0x8006, 0 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json index be03b2704f..e1b3a83551 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.json +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 7, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 14, "y": 11, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 14, "y": 12, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 10, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 34feceb39b..cf21c3c131 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 @@ -259,12 +259,12 @@ BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003 BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005 applymovement 1, BattleFrontier_BattleArenaLobby_Movement_256034 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256041 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256041 waitmovement 0 opendoor 2, 2 waitdooranim applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C waitmovement 0 closedoor 2, 2 waitdooranim @@ -308,12 +308,12 @@ BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25607F - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256088 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256088 waitmovement 0 opendoor 11, 2 waitdooranim applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C waitmovement 0 closedoor 11, 2 waitdooranim diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json index 65428e6233..5690e9eb9a 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 5, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 7, "y": 2, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 9, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 11, "y": 2, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 16, "y": 2, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 2, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 16, "y": 1, "elevation": 0, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 8, "y": 1, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 0, "y": 4, "elevation": 0, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 12, "y": 1, "elevation": 0, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 13, "y": 2, "elevation": 0, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 10, "y": 2, "elevation": 0, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 4, "y": 9, "elevation": 4, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 14, "y": 2, "elevation": 0, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 6, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 1ee9c29dc0..e501efcd88 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -27,11 +27,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC return BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00 @@ -551,7 +551,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC setvar VAR_TEMP_1, 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc @@ -595,76 +595,76 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F return BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530 - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH return BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594 - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1 + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, 1 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652 - createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_5, 3, 5, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 5, 7, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_3, 8, 10, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_BEAUTY, 12, 14, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_HIKER, 14, 12, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_3, 18, 6, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_2, 21, 10, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 14, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_5, 3, 5, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 5, 7, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_3, 8, 10, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 12, 14, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_HIKER, 14, 12, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_3, 18, 6, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_2, 21, 10, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_GENTLEMAN, 24, 14, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_FAT_MAN, 27, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH return BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json index afd83f7e54..987ea14df5 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.json +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 23, "y": 5, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index deea13c837..2a97e2ae71 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -15,12 +15,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 waitmovement 0 opendoor 13, 3 waitdooranim applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1AE + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1AE waitmovement 0 closedoor 13, 3 waitdooranim @@ -28,12 +28,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 waitmovement 0 opendoor 37, 3 waitdooranim applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 waitmovement 0 closedoor 37, 3 waitdooranim diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json index 66bc381a3a..4298ac00ec 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.json +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 10, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 1, "y": 11, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 14, "y": 14, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 18, "y": 14, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 14, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 17, "y": 10, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 12940496db..df167314ac 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F @@ -313,7 +313,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CDD compare VAR_FRONTIER_BATTLE_MODE, 1 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CE5 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D2D @@ -324,7 +324,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CED compare VAR_FRONTIER_BATTLE_MODE, 1 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CF5 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D39 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json index 2766f023ea..35eea57870 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 8987f3e076..9b9fb45377 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 @@ -24,7 +24,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 setvar VAR_0x8006, 1 special CallFrontierUtilFunc setvar VAR_TEMP_0, 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 waitmovement 0 lockall @@ -171,11 +171,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D closemessage applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 waitmovement 0 opendoor 5, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 waitmovement 0 closedoor 5, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json index 215165ec6d..2bfd0fe45d 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 6, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 7, "y": 4, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 4, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 8, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 12, "y": 4, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 12, "y": 6, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 12, "y": 8, "elevation": 0, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 11, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index a6e02f4430..d3cecf3bb8 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -30,7 +30,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A setvar VAR_TEMP_1, 1 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM compare VAR_TEMP_F, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM @@ -39,11 +39,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 end BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25 - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 @@ -55,7 +55,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B closemessage applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B waitmovement 0 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7 @@ -65,7 +65,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 compare VAR_TEMP_F, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B waitmovement 0 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 setvar VAR_0x8004, 11 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json index 43599f9d48..46926168a7 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/map.json +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 4, "y": 7, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 3, "y": 11, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 14, "y": 11, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 11, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 6, "y": 10, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 14, "y": 7, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index cead1a1d7d..9bb3a93138 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 @@ -223,7 +223,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A compare VAR_FRONTIER_BATTLE_MODE, 1 call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258762 applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC waitmovement 0 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 setvar VAR_TEMP_0, 0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json index c532df91f0..900e54d775 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 8, "y": 12, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 97365a46e6..92bd2e9bd6 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -15,7 +15,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF turnobject 1, DIR_SOUTH BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF @@ -27,7 +27,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A waitmovement 0 compare VAR_0x8006, 2 goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 @@ -448,12 +448,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6 return BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json index 06cb5452e2..ca356ecb77 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 1, "y": 9, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 13, "y": 1, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 1, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_DUSCLOPS", + "graphics_id": "OBJ_EVENT_GFX_DUSCLOPS", "x": 13, "y": 1, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 13, "y": 1, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 94c21a6d01..aff5518370 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -19,13 +19,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 return BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 @@ -357,7 +357,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 setvar VAR_TEMP_1, 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 removeobject 2 applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json index 51e1200a39..ac4319ee8f 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 8, "y": 12, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 3, "y": 5, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KIRLIA", + "graphics_id": "OBJ_EVENT_GFX_KIRLIA", "x": 12, "y": 6, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 15, "y": 5, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 4, "y": 9, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 13, "y": 9, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 3, "y": 10, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 5df680aa8a..a6116d3dc5 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 delay 16 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 waitmovement 0 lockall setvar VAR_0x8004, 3 @@ -31,12 +31,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 waitmovement 0 opendoor 6, 3 waitdooranim applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 waitmovement 0 closedoor 6, 3 waitdooranim @@ -44,12 +44,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5CB - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2 waitmovement 0 opendoor 10, 3 waitdooranim applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 waitmovement 0 closedoor 10, 3 waitdooranim diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json index cd22af8260..3e03a02574 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/map.json +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 6, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 8, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 24, "y": 5, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 18, "y": 10, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 2, "y": 10, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 19, "y": 6, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 649b20f875..7da76531de 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D @@ -303,7 +303,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC compare VAR_FRONTIER_BATTLE_MODE, 1 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC29 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC2F @@ -311,7 +311,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC35 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC3B diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json index 11bab3e77d..e2fd0e1060 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 6bfd5b0452..cef06f1be3 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -18,14 +18,14 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED setvar VAR_0x8005, 1 special CallBattlePikeFunction - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 waitmovement 0 lockall msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, MSGBOX_DEFAULT closemessage releaseall - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E waitmovement 0 setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 setvar VAR_0x8005, 0 @@ -42,7 +42,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7 BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json index 656686bcf0..74a4a3f2d8 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.json +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 5, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 10, "y": 9, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 0, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 9, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index d145ba429d..b06d902001 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3 BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 @@ -263,7 +263,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80 BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94 applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_25BAA6 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_25BAA6 waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json index c50612631c..339a2ab09d 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index deb0a79745..51dc3fcafe 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -113,7 +113,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, MSGBOX_DEFAULT closemessage special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 + applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2 waitmovement 0 playse 267 @@ -215,7 +215,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC waitmovement 0 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 1 @@ -277,7 +277,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB waitmovement 0 setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG setvar VAR_0x8005, 0 @@ -285,7 +285,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E msgbox gStringVar4, MSGBOX_DEFAULT closemessage delay 16 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD waitmovement 0 setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG setvar VAR_0x8005, 1 @@ -302,13 +302,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC:: @ 825D5DC - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD waitmovement 0 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC waitmovement 0 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF waitmovement 0 end @@ -431,7 +431,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774:: @ 825D774 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B closemessage - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC waitmovement 0 setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json index bf2b05e94c..1ae60e075b 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index b1a55c33fa..1480ec5300 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -34,7 +34,7 @@ BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8 setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index ff5e3e1dbc..59731f74d7 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466 BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470 setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index d6fa8acd48..eb8a3ce271 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 4, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 8, "y": 5, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index 53a7960117..49a5e58fb9 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json index 606367cbab..acb21c8800 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 0, "y": 0, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 1, "y": 0, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 2, "y": 0, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 3, "y": 0, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 4, "y": 0, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 5, "y": 0, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 6, "y": 0, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 0, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 0, "y": 1, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 1, "y": 1, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 3, "y": 1, "elevation": 0, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 4, "y": 1, "elevation": 0, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 5, "y": 1, "elevation": 0, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 6, "y": 1, "elevation": 0, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 1, "elevation": 0, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 2, "y": 1, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json index 69ceef7980..ef1bb903ab 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 7, "y": 12, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 14, "y": 13, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 2, "y": 15, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 12, "y": 16, "elevation": 4, diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 0b30d96e30..9f5560bfee 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 @@ -434,7 +434,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA @@ -457,7 +457,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C closemessage applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DD8 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DD8 waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index 25104660ed..92276035fc 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 17, "y": 11, "elevation": 6, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BRANDON", + "graphics_id": "OBJ_EVENT_GFX_BRANDON", "x": 17, "y": 7, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 7b777b1655..1d0bcf395b 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH compare VAR_TEMP_C, 0 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3 setobjectxyperm 2, 0, 0 @@ -96,7 +96,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 closemessage applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_255403 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_255403 waitmovement 0 applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400 waitmovement 0 @@ -139,7 +139,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2552D0 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C + applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT closemessage @@ -186,7 +186,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255388 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C + applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json index 193eec7245..b58ed2b8ca 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 5, "y": 1, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index e305260df2..446ec7702f 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -18,7 +18,7 @@ BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62 BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C setvar VAR_TEMP_0, 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179 waitmovement 0 setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 setvar VAR_0x8005, 2 @@ -27,7 +27,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 setvar VAR_TEMP_2, 1 setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 @@ -79,7 +79,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT playfanfare MUS_ME_ASA @@ -146,7 +146,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC closemessage - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 waitmovement 0 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 waitmovement 0 @@ -275,7 +275,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79 BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF call BattleFrontier_BattleTowerBattleRoom_EventScript_242170 closemessage - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 waitmovement 0 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 waitmovement 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json index 53717b450b..905102cd33 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 5, "y": 1, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 4, "y": 1, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 4, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_E", + "graphics_id": "OBJ_EVENT_GFX_VAR_E", "x": 5, "y": 8, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index f447434f1b..4a0c26e20c 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -17,11 +17,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F checkplayergender compare VAR_RESULT, FEMALE goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL return BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29 - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL return BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 .2byte 0 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 end BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json index 6961d2ba5d..329e5a2e42 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 9, "y": 2, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc index a729615626..3da4302a26 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -24,13 +24,13 @@ BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 compare VAR_0x8006, 1 goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39 waitmovement 0 goto BattleFrontier_BattleTowerCorridor_EventScript_241B27 BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36 waitmovement 0 BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json index bf5f7c8f2a..637d468fd7 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 1, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 14, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_E", + "graphics_id": "OBJ_EVENT_GFX_VAR_E", "x": 14, "y": 1, "elevation": 0, diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index a53cac0c58..7c49338169 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -17,11 +17,11 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 checkplayergender compare VAR_RESULT, FEMALE goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL return BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL return BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91 @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 .2byte 0 BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 special OffsetCameraForBattle diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json index 4df8652e7d..f9baf201fb 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.json +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index f84ec194d2..29081f82af 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A waitmovement 0 special BufferBattleTowerElevatorFloors waitse @@ -18,7 +18,7 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 waitstate delay 48 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92 waitmovement 0 call BattleFrontier_BattleTowerElevator_EventScript_241A28 end @@ -85,6 +85,6 @@ BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index b7cf2d9e7e..41a07eeb85 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 23, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 17, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 15, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 11, "y": 9, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 1, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_APPRENTICE" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 5, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 14, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 18, "y": 5, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 9881def317..ee6ff15a8c 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -35,7 +35,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9 BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD @@ -767,12 +767,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B call BattleFrontier_BattleTowerLobby_EventScript_23F1E8 call BattleFrontier_BattleTowerLobby_EventScript_23F22D applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F195 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F195 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F195 waitmovement 0 opendoor VAR_0x8004, 1 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F199 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F19C + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F19C waitmovement 0 closedoor VAR_0x8004, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json index 1e461f09f9..a82fc2d547 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 11, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 2, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 17, "y": 11, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 6, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 8, "y": 13, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 10, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 13, "y": 10, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 15, "y": 13, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 4, "y": 12, "elevation": 3, diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 9da5e6a146..4692264e70 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -25,14 +25,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_BOY_1 setvar VAR_TEMP_1, 1 setvar VAR_TEMP_3, 1 setobjectxyperm 1, 10, 2 @@ -43,7 +43,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14 .2byte 0 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23 @@ -59,12 +59,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 lockall - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 waitmovement 0 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 copyobjectxytoperm 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty @@ -118,19 +118,19 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A waitmovement 0 return BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E waitmovement 0 return BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 waitmovement 0 return diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json index c4400bfffe..00be52caf0 100644 --- a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json +++ b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 0, "y": 5, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 0, "y": 4, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 14, "y": 6, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 9, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 5, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 9, "y": 5, "elevation": 0, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 4, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 12, "y": 10, "elevation": 0, diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json index a33406ffc6..16153573b8 100644 --- a/data/maps/BattleFrontier_Lounge1/map.json +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 0, "y": 6, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 7, "y": 6, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 4, "elevation": 0, diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json index 64e4e80d3c..75c01f4b46 100644 --- a/data/maps/BattleFrontier_Lounge2/map.json +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 10, "y": 4, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 10, "y": 3, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 4, "y": 6, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 10, "y": 5, "elevation": 0, diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json index 68f862a903..e0a6755fd5 100644 --- a/data/maps/BattleFrontier_Lounge3/map.json +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 6, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 4, "y": 4, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 5, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 5, "y": 5, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 0, "y": 6, "elevation": 0, diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json index 21b6517f0f..c43d69f06e 100644 --- a/data/maps/BattleFrontier_Lounge4/map.json +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 6, "y": 6, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 0, "y": 5, "elevation": 0, diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json index a403e8fc58..97cf8df43d 100644 --- a/data/maps/BattleFrontier_Lounge5/map.json +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 12, "y": 4, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 0, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 5, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 11, "y": 7, "elevation": 0, diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json index a0d53ac562..0ba285fbd8 100644 --- a/data/maps/BattleFrontier_Lounge6/map.json +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 2, "y": 4, "elevation": 0, diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json index 349707d5a9..4b265f59ac 100644 --- a/data/maps/BattleFrontier_Lounge7/map.json +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 0, "y": 7, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 2, "y": 5, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 6, "y": 5, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 8, "y": 3, "elevation": 0, diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json index bd5feaf387..aa974f1d13 100644 --- a/data/maps/BattleFrontier_Lounge8/map.json +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 4, "y": 5, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 8, "y": 7, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 4, "elevation": 0, diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json index 7d55c46588..f5bf1ef18a 100644 --- a/data/maps/BattleFrontier_Lounge9/map.json +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 6, "y": 3, "elevation": 0, diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index f42d5e24b8..c561316b31 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 5, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index 87cf27b70b..5f15171889 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -21,7 +21,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 20, "y": 17, "elevation": 0, @@ -34,7 +34,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 42, "y": 15, "elevation": 0, @@ -47,7 +47,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 53, "y": 6, "elevation": 0, @@ -60,7 +60,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 54, "y": 16, "elevation": 0, @@ -73,7 +73,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 37, "y": 32, "elevation": 0, @@ -86,7 +86,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 41, "y": 56, "elevation": 3, @@ -99,7 +99,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 8, "y": 46, "elevation": 0, @@ -112,7 +112,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 34, "y": 41, "elevation": 0, @@ -125,7 +125,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 45, "y": 47, "elevation": 3, @@ -138,7 +138,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 59, "y": 35, "elevation": 0, @@ -151,7 +151,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 18, "y": 40, "elevation": 0, @@ -164,7 +164,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 17, "y": 40, "elevation": 0, @@ -177,7 +177,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 40, "y": 56, "elevation": 3, @@ -190,7 +190,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SUDOWOODO", + "graphics_id": "OBJ_EVENT_GFX_SUDOWOODO", "x": 54, "y": 62, "elevation": 3, @@ -203,7 +203,7 @@ "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 42, "y": 34, "elevation": 3, @@ -216,7 +216,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 51, "y": 53, "elevation": 3, @@ -229,7 +229,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 62, "y": 18, "elevation": 0, @@ -242,7 +242,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 11, "y": 21, "elevation": 0, @@ -255,7 +255,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 10, "y": 21, "elevation": 0, @@ -268,7 +268,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 16, "y": 30, "elevation": 0, @@ -281,7 +281,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 33, "y": 14, "elevation": 0, @@ -294,7 +294,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 54, "y": 31, "elevation": 0, @@ -307,7 +307,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 54, "y": 32, "elevation": 0, @@ -320,7 +320,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 58, "y": 55, "elevation": 3, @@ -333,7 +333,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 48, "y": 41, "elevation": 0, @@ -346,7 +346,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 29, "y": 14, "elevation": 0, diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index 991b29ba95..ba7ea615a2 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -21,7 +21,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 26, "y": 38, "elevation": 0, @@ -34,7 +34,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 20, "y": 70, "elevation": 0, @@ -47,7 +47,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 19, "y": 68, "elevation": 0, @@ -60,7 +60,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 26, "y": 20, "elevation": 0, @@ -73,7 +73,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 27, "y": 30, "elevation": 0, @@ -86,7 +86,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 33, "y": 41, "elevation": 0, @@ -99,7 +99,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 28, "y": 43, "elevation": 0, @@ -112,7 +112,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 17, "y": 20, "elevation": 0, @@ -125,7 +125,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 13, "y": 44, "elevation": 0, @@ -138,7 +138,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 44, "elevation": 0, @@ -151,7 +151,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 23, "y": 47, "elevation": 0, @@ -164,7 +164,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 38, "y": 27, "elevation": 0, @@ -177,7 +177,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 45, "y": 18, "elevation": 0, @@ -190,7 +190,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 9, "y": 47, "elevation": 0, @@ -203,7 +203,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 35, "y": 5, "elevation": 0, @@ -216,7 +216,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 11, "y": 66, "elevation": 0, @@ -229,7 +229,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 31, "y": 31, "elevation": 0, @@ -242,7 +242,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 42, "y": 48, "elevation": 0, @@ -255,7 +255,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 38, "y": 22, "elevation": 0, @@ -268,7 +268,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 9, "elevation": 0, @@ -281,7 +281,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 12, "y": 10, "elevation": 0, @@ -294,7 +294,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 11, "y": 10, "elevation": 0, @@ -307,7 +307,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 5, "elevation": 0, @@ -320,7 +320,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 4, "y": 26, "elevation": 0, diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index 8c79311ee8..7e90fc9df1 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 4, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 11, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 2, "y": 3, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 1, "y": 3, "elevation": 3, diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index 4175b037ee..d36bcce730 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json index 58c15fc0ab..c2205cd512 100644 --- a/data/maps/BattleFrontier_RankingHall/map.json +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 24, "y": 13, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 4, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 44, "y": 11, "elevation": 3, diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index 699eb4b0e7..ab82eec3e0 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 11, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 8, "y": 11, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 8, "y": 4, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 4, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 0, "y": 4, "elevation": 0, diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index cb01034ad3..94fadd69ac 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter waitmovement 0 goto BattleFrontier_ReceptionGate_EventScript_ScottScene end @@ -40,18 +40,18 @@ BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229 closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement 2, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark applymovement 2, Common_Movement_ExclamationMark - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_GreeterFaceScott applymovement 2, BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerFaceScott + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerFaceScott applymovement 4, BattleFrontier_ReceptionGate_Movement_ScottEnter waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json index 552d555085..c1314f0ceb 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.json +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json index 002671d4a5..e96b67b575 100644 --- a/data/maps/BattlePyramidSquare01/map.json +++ b/data/maps/BattlePyramidSquare01/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 2, "y": 3, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 5, "y": 3, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 2, "y": 6, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 6, "y": 6, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 1, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 4, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 4, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json index 8d5704b7ea..7c02f92f3a 100644 --- a/data/maps/BattlePyramidSquare02/map.json +++ b/data/maps/BattlePyramidSquare02/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 2, "y": 1, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 5, "y": 6, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 6, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 5, "y": 1, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 5, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 0, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 2, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json index ebf439db25..913e60446a 100644 --- a/data/maps/BattlePyramidSquare03/map.json +++ b/data/maps/BattlePyramidSquare03/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 2, "y": 1, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 1, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 6, "y": 4, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 4, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 2, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 3, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 7, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json index a051f94947..3bfec59a27 100644 --- a/data/maps/BattlePyramidSquare04/map.json +++ b/data/maps/BattlePyramidSquare04/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 2, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 7, "y": 7, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 1, "y": 4, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 6, "y": 4, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 6, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 0, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json index b7127dc195..335f9c37c2 100644 --- a/data/maps/BattlePyramidSquare05/map.json +++ b/data/maps/BattlePyramidSquare05/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 6, "y": 4, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 3, "y": 7, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 3, "y": 1, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 6, "y": 0, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 3, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json index 70352aec3c..7a2ef4e056 100644 --- a/data/maps/BattlePyramidSquare06/map.json +++ b/data/maps/BattlePyramidSquare06/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 5, "y": 2, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 2, "y": 5, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 5, "y": 5, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 2, "y": 2, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 7, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 0, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json index afcddbb5e5..da5c044c4c 100644 --- a/data/maps/BattlePyramidSquare07/map.json +++ b/data/maps/BattlePyramidSquare07/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 0, "y": 6, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 4, "y": 0, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 0, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 4, "y": 4, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 4, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 1, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 7, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json index 78cb972ecf..5372fcb358 100644 --- a/data/maps/BattlePyramidSquare08/map.json +++ b/data/maps/BattlePyramidSquare08/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 1, "y": 2, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 5, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 1, "y": 5, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 2, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 6, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 0, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json index 09c06273e6..3ee9a73930 100644 --- a/data/maps/BattlePyramidSquare09/map.json +++ b/data/maps/BattlePyramidSquare09/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 0, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 4, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 0, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 5, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 0, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 0, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 6, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json index 3a90be443c..0105a69b97 100644 --- a/data/maps/BattlePyramidSquare10/map.json +++ b/data/maps/BattlePyramidSquare10/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 3, "y": 0, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 3, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 6, "y": 5, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 5, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 6, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 1, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json index 373b02b6ee..3ee42d88fd 100644 --- a/data/maps/BattlePyramidSquare11/map.json +++ b/data/maps/BattlePyramidSquare11/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 3, "y": 2, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 3, "y": 6, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 6, "y": 4, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 6, "y": 7, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 2, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 2, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 5, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json index fd5015559d..5e20669468 100644 --- a/data/maps/BattlePyramidSquare12/map.json +++ b/data/maps/BattlePyramidSquare12/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 7, "y": 5, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 0, "y": 5, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 3, "y": 0, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 3, "y": 3, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 2, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 3, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 7, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index c950579ed0..77df4a8aed 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 5, "y": 1, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 5, "y": 6, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 1, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 6, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 1, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 0, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 3, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json index 73815cdf15..9954f1b540 100644 --- a/data/maps/BattlePyramidSquare14/map.json +++ b/data/maps/BattlePyramidSquare14/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 1, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 1, "y": 1, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 5, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 0, "y": 5, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json index 6443401c32..7b7e694720 100644 --- a/data/maps/BattlePyramidSquare15/map.json +++ b/data/maps/BattlePyramidSquare15/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 2, "y": 5, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 2, "y": 1, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 4, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 0, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 2, "elevation": 4, diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index c1c060aac3..7b8e6fb32e 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 0, "y": 6, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 1, "y": 0, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 7, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 0, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 7, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 2, "elevation": 4, diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index bd354987a0..7ebcca911e 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DEOXYS_TRIANGLE", + "graphics_id": "OBJ_EVENT_GFX_DEOXYS_TRIANGLE", "x": 15, "y": 12, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE" }, { - "graphics_id": "EVENT_OBJ_GFX_DEOXYS", + "graphics_id": "OBJ_EVENT_GFX_DEOXYS", "x": 15, "y": 3, "elevation": 0, diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index b51940a7c6..8cf47bfdb4 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -10,7 +10,7 @@ BirthIsland_Exterior_OnReturnToField: @ 8267F25 BirthIsland_Exterior_OnTransition: @ 8267F29 setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0 setvar VAR_DEOXYS_ROCK_LEVEL, 0 call_if_set FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index 4848c8b223..f6dec3c927 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 5, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 7, "elevation": 1, diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index abde3377cf..61843121a2 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 9, "y": 13, "elevation": 3, diff --git a/data/maps/ContestHall/map.json b/data/maps/ContestHall/map.json index b8dcf0c420..61cf464e1c 100644 --- a/data/maps/ContestHall/map.json +++ b/data/maps/ContestHall/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 6, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 7, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 7, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 8, "y": 7, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 2, "y": 6, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 4, "y": 2, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 5, "y": 2, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 9, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 10, "y": 2, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 12, "y": 5, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 2, "y": 5, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_HIDE_CONTEST_POKE_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 10, "y": 7, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 12, "y": 6, "elevation": 3, diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc index a5fd02d937..33e074e8ab 100644 --- a/data/maps/ContestHall/scripts.inc +++ b/data/maps/ContestHall/scripts.inc @@ -75,7 +75,7 @@ ContestHall_EventScript_Contest:: @ 823B829 ContestHall_EventScript_SetContestObjects:: @ 823B834 special LoadLinkContestPlayerPalettes - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN call ContestHall_EventScript_CreateAudience end @@ -174,131 +174,131 @@ ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8 end ContestHall_EventScript_RandomAudienceNinjaBoy:: @ 823BA6B - setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY + setvar VAR_TEMP_1, OBJ_EVENT_GFX_NINJA_BOY return ContestHall_EventScript_RandomAudienceTwin:: @ 823BA71 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN + setvar VAR_TEMP_1, OBJ_EVENT_GFX_TWIN return ContestHall_EventScript_RandomAudienceBoy1:: @ 823BA77 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_BOY_1 return ContestHall_EventScript_RandomAudienceGirl1:: @ 823BA7D - setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_1 return ContestHall_EventScript_RandomAudienceGirl2:: @ 823BA83 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_2 return ContestHall_EventScript_RandomAudienceLittleBoy:: @ 823BA89 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY + setvar VAR_TEMP_1, OBJ_EVENT_GFX_LITTLE_BOY return ContestHall_EventScript_RandomAudienceGirl:: @ 823BA8F - setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL + setvar VAR_TEMP_1, OBJ_EVENT_GFX_LITTLE_GIRL return ContestHall_EventScript_RandomAudienceBoy3:: @ 823BA95 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_BOY_3 return ContestHall_EventScript_RandomAudienceGirl3:: @ 823BA9B - setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_3 return ContestHall_EventScript_RandomAudienceRichBoy:: @ 823BAA1 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY + setvar VAR_TEMP_1, OBJ_EVENT_GFX_RICH_BOY return ContestHall_EventScript_RandomAudienceFatMan:: @ 823BAA7 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN + setvar VAR_TEMP_1, OBJ_EVENT_GFX_FAT_MAN return ContestHall_EventScript_RandomAudiencePokefanF:: @ 823BAAD - setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F + setvar VAR_TEMP_1, OBJ_EVENT_GFX_POKEFAN_F return ContestHall_EventScript_RandomAudienceMan1:: @ 823BAB3 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_MAN_1 return ContestHall_EventScript_RandomAudienceWoman2:: @ 823BAB9 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_2 return ContestHall_EventScript_RandomAudienceExpertM:: @ 823BABF - setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M + setvar VAR_TEMP_1, OBJ_EVENT_GFX_EXPERT_M return ContestHall_EventScript_RandomAudienceExpertF:: @ 823BAC5 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F + setvar VAR_TEMP_1, OBJ_EVENT_GFX_EXPERT_F return ContestHall_EventScript_RandomAudiencePokefanM:: @ 823BACB - setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M + setvar VAR_TEMP_1, OBJ_EVENT_GFX_POKEFAN_M return ContestHall_EventScript_RandomAudienceWoman4:: @ 823BAD1 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_4 return ContestHall_EventScript_RandomAudienceCook:: @ 823BAD7 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK + setvar VAR_TEMP_1, OBJ_EVENT_GFX_COOK return ContestHall_EventScript_RandomAudienceLass:: @ 823BADD - setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS + setvar VAR_TEMP_1, OBJ_EVENT_GFX_LASS return ContestHall_EventScript_RandomAudienceOldWoman:: @ 823BAE3 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN + setvar VAR_TEMP_1, OBJ_EVENT_GFX_OLD_WOMAN return ContestHall_EventScript_RandomAudienceCamper:: @ 823BAE9 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER + setvar VAR_TEMP_1, OBJ_EVENT_GFX_CAMPER return ContestHall_EventScript_RandomAudiencePicnicker:: @ 823BAEF - setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER + setvar VAR_TEMP_1, OBJ_EVENT_GFX_PICNICKER return ContestHall_EventScript_RandomAudienceMan3:: @ 823BAF5 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_MAN_3 return ContestHall_EventScript_RandomAudienceWoman5:: @ 823BAFB - setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_5 return ContestHall_EventScript_RandomAudienceYoungster:: @ 823BB01 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER + setvar VAR_TEMP_1, OBJ_EVENT_GFX_YOUNGSTER return ContestHall_EventScript_RandomAudienceBugCatcher:: @ 823BB07 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER + setvar VAR_TEMP_1, OBJ_EVENT_GFX_BUG_CATCHER return ContestHall_EventScript_RandomAudiencePsychicM:: @ 823BB0D - setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M + setvar VAR_TEMP_1, OBJ_EVENT_GFX_PSYCHIC_M return ContestHall_EventScript_RandomAudienceSchoolKidM:: @ 823BB13 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M + setvar VAR_TEMP_1, OBJ_EVENT_GFX_SCHOOL_KID_M return ContestHall_EventScript_RandomAudienceBlackBelt:: @ 823BB19 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT + setvar VAR_TEMP_1, OBJ_EVENT_GFX_BLACK_BELT return ContestHall_EventScript_RandomAudienceBeauty:: @ 823BB1F - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY + setvar VAR_TEMP_1, OBJ_EVENT_GFX_BEAUTY return ContestHall_EventScript_RandomAudienceScientist1:: @ 823BB25 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_SCIENTIST_1 return ContestHall_EventScript_CreateAudience:: @ 823BB2B @@ -314,97 +314,97 @@ ContestHall_EventScript_CreateAudience:: @ 823BB2B return ContestHall_EventScript_CreateNormalContestAudience:: @ 823BB78 - createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH return ContestHall_EventScript_CreateSuperContestAudience:: @ 823BB8B - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH return ContestHall_EventScript_CreateHyperContestAudience:: @ 823BBE6 - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH return ContestHall_EventScript_CreateMasterContestAudience:: @ 823BC92 - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH return ContestHall_EventScript_CreateWirelessContestAudience:: @ 823BD86 - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH return ContestHall_EventScript_SetExitWarp:: @ 823BE44 @@ -451,10 +451,10 @@ LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: @ 823BEB6 return LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan:: @ 823BECE - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay:: @ 823BED4 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 54f5e1663d..4b8042e248 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGIROCK", + "graphics_id": "OBJ_EVENT_GFX_REGIROCK", "x": 8, "y": 7, "elevation": 3, diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index 634fbcc069..f23e3e311b 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 132, "y": 10, "elevation": 0, diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 739eac766c..240bc37feb 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 12, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 9, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 12, "y": 14, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 12, "y": 8, "elevation": 1, @@ -78,7 +78,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 137b394b19..3228fb4b62 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -117,29 +117,29 @@ DewfordTown_EventScript_FishingNotSoGood:: @ 81E9656 DewfordTown_EventScript_SailToPetalburg:: @ 81E9660 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0 + setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic applymovement 4, DewfordTown_Movement_SailToPetalburg - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToPetalburg + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_SailToPetalburg waitmovement 0 - showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 + showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 call Common_EventScript_StopBrineysBoatMusic - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg waitmovement 0 - showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 + showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN setvar VAR_BOARD_BRINEY_BOAT_STATE, 2 - resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar VAR_BRINEY_LOCATION, VAR_0x8008 waitstate @@ -149,20 +149,20 @@ DewfordTown_EventScript_SailToPetalburg:: @ 81E9660 DewfordTown_EventScript_SailToSlateport:: @ 81E96E7 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1 + setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic applymovement 4, DewfordTown_Movement_SailToSlateport - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToSlateport + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_SailToSlateport waitmovement 0 call Common_EventScript_StopBrineysBoatMusic - showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport + showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 @@ -178,7 +178,7 @@ DewfordTown_EventScript_SailToSlateport:: @ 81E96E7 call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 - resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 copyobjectxytoperm 2 release diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index e3e3cb9489..869072bcb2 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BRAWLY", + "graphics_id": "OBJ_EVENT_GFX_BRAWLY", "x": 4, "y": 3, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 18, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 15, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 12, "y": 25, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 5, "y": 24, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 8, "elevation": 1, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 16, "y": 9, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 14, "y": 12, "elevation": 1, diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index 2271696cb7..f018150236 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 4, "y": 6, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 5, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 4, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 9, "y": 3, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 5, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 7, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 12, "y": 3, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 15, "y": 3, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 971dd23215..6a7051ec99 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_DebateReact1:: @ 81FD73A DewfordTown_Hall_EventScript_PlayerReactWest:: @ 81FD75B compare VAR_FACING, DIR_EAST goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_PlayerReactNorthSouth:: @ 81FD793 return DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp:: @ 81FD7AA - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown:: @ 81FD7B5 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return DewfordTown_Hall_EventScript_PlayerReactEast:: @ 81FD7C0 compare VAR_FACING, DIR_WEST goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index 898cecb1ef..a77835ecff 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 6, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index fa54854499..0d589c357b 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 30b94e5547..4ea6e62483 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 10, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 5, "y": 5, "elevation": 0, diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 7d45123e9a..e72885ecb8 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 1cfe9d16c8..fbfc6a9029 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 12, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_CHAMPIONS_ROOM_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 12, "elevation": 3, diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 22acc0361d..0f90ee2ac3 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_OnWarp: @ 8228A05 .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth:: @ 8228A0F - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_ChampionsRoom_OnFrame: @ 8228A14 @@ -22,10 +22,10 @@ EverGrandeCity_ChampionsRoom_OnFrame: @ 8228A14 EverGrandeCity_ChampionsRoom_EventScript_EnterRoom:: @ 8228A1E lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp4 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp4 waitmovement 0 delay 40 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace waitmovement 0 setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_Wallace @@ -105,7 +105,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_BirchArrives waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT call ProfBirch_EventScript_RatePokedex @@ -119,12 +119,12 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30 closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart applymovement 3, Common_Movement_WalkInPlaceFastestUp applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalFollows waitmovement 0 delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT checkplayergender @@ -134,7 +134,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30 call_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExit - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit waitmovement 0 setflag FLAG_HIDE_PETALBURG_GYM_GREETER warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: @ 8228BF4 EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 8228BFD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 21388e4626..62bd432e06 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DRAKE", + "graphics_id": "OBJ_EVENT_GFX_DRAKE", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 139154fa95..d3b26f6d94 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -10,7 +10,7 @@ EverGrandeCity_DrakesRoom_OnWarp: @ 82286AC .2byte 0 EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth:: @ 82286B6 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_DrakesRoom_OnFrame: @ 82286BB diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 49de0534da..44f2010dac 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GLACIA", + "graphics_id": "OBJ_EVENT_GFX_GLACIA", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 6836b886db..4ca98e9213 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_OnWarp: @ 8228422 .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth:: @ 822842C - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_GlaciasRoom_OnFrame: @ 8228431 diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc index cd9bd27c14..cf68eb8c77 100644 --- a/data/maps/EverGrandeCity_Hall1/scripts.inc +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall1_OnWarp: @ 822956F .2byte 0 EverGrandeCity_Hall1_EventScript_TurnPlayerNorth:: @ 8229579 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc index 4591aa111d..d8702657fa 100644 --- a/data/maps/EverGrandeCity_Hall2/scripts.inc +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall2_OnWarp: @ 8229584 .2byte 0 EverGrandeCity_Hall2_EventScript_TurnPlayerNorth:: @ 822958E - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc index 7bd895fd07..65dc3c44c8 100644 --- a/data/maps/EverGrandeCity_Hall3/scripts.inc +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall3_OnWarp: @ 8229599 .2byte 0 EverGrandeCity_Hall3_EventScript_TurnPlayerNorth:: @ 82295A3 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc index 54d7adfc38..e75d12483b 100644 --- a/data/maps/EverGrandeCity_Hall4/scripts.inc +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall4_OnWarp: @ 82295AE .2byte 0 EverGrandeCity_Hall4_EventScript_TurnPlayerNorth:: @ 82295B8 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc index 1ba85b999a..b8eaed7b96 100644 --- a/data/maps/EverGrandeCity_Hall5/scripts.inc +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall5_OnWarp: @ 82295C3 .2byte 0 EverGrandeCity_Hall5_EventScript_TurnPlayerNorth:: @ 82295CD - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index 387ded6e1e..393a7b96bb 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 6, "y": 16, "elevation": 3, diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 3fe146f998..e7acaa868b 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_OnWarp: @ 8229837 .2byte 0 EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth:: @ 8229841 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_HallOfFame_OnFrame: @ 8229846 @@ -18,24 +18,24 @@ EverGrandeCity_HallOfFame_OnFrame: @ 8229846 EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850 lockall applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 waitmovement 0 delay 20 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 dofieldeffect FLDEFF_HALL_OF_FAME_RECORD diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 7e15516d96..72981147cd 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PHOEBE", + "graphics_id": "OBJ_EVENT_GFX_PHOEBE", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 4843359c01..9949007981 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_OnWarp: @ 8228184 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth:: @ 822818E - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_PhoebesRoom_OnFrame: @ 8228193 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index da17bd1979..83d8f7a949 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 10, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index 81a0388279..cb5df65b29 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index 7a70ef9682..a258ebd38f 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 3, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 16, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 8, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 8140258953..72c069243c 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -77,12 +77,12 @@ EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 8229636 end EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight:: @ 8229698 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight waitmovement 0 return EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: @ 82296A3 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index edaf0124ee..ad042dd653 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 86ebc8211a..e1d878f753 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SIDNEY", + "graphics_id": "OBJ_EVENT_GFX_SIDNEY", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 74cd384fb9..20a7e04195 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -29,7 +29,7 @@ EverGrandeCity_SidneysRoom_OnWarp: @ 8227F3E .2byte 0 EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth:: @ 8227F48 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_SidneysRoom_OnFrame: @ 8227F4D diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index b394b13e4d..191b232008 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 11, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 11, "y": 9, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 15, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 8, "y": 12, "elevation": 3, diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json index 93b8f97e0c..be922e946f 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/map.json +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 4, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 2, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 5, "y": 1, "elevation": 3, diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 18f39ecd14..5526ad92f0 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -17,13 +17,13 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF return FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD @@ -260,7 +260,7 @@ FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 .2byte 0 FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM removeobject 3 setvar VAR_TEMP_1, 1 diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json index abcfa98f97..fd315091d6 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/map.json +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc index 3270338295..82c9c97a1a 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -10,12 +10,12 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 lockall setvar VAR_TEMP_0, 1 applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB - applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_2006FB + applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_2006FB waitmovement 0 opendoor 2, 1 waitdooranim applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701 - applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_200700 + applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_200700 waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index 26eff92e0c..2339a37328 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 1, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 12, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 0, "y": 7, "elevation": 3, diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index b5cc435582..b4842109a5 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 @@ -245,12 +245,12 @@ FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF applymovement 1, FallarborTown_BattleTentLobby_Movement_2001FE - applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200205 + applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200205 waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, FallarborTown_BattleTentLobby_Movement_200202 - applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200209 + applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200209 waitmovement 0 closedoor 6, 1 waitdooranim diff --git a/data/maps/FallarborTown_CozmosHouse/map.json b/data/maps/FallarborTown_CozmosHouse/map.json index 3a56d2dc29..77187255a6 100644 --- a/data/maps/FallarborTown_CozmosHouse/map.json +++ b/data/maps/FallarborTown_CozmosHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index f90ce102c4..bf72fa1d90 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 9, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 2, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json index af97d2b024..12b0f13efb 100644 --- a/data/maps/FallarborTown_MoveRelearnersHouse/map.json +++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index e841014693..00ab6142be 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 2, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 2, "elevation": 3, diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index a65da7770a..668a7cb2dc 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index c8f4835968..9ce1273856 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 39, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 13, "y": 41, "elevation": 1, diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index 47be4d5df6..fce5bf34ea 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MEW", + "graphics_id": "OBJ_EVENT_GFX_MEW", "x": 13, "y": 17, "elevation": 3, diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 0858d14706..4760caebc3 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_FIERY_PATH_TM06" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 15, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 15, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 12, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 23, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 24, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 32, "elevation": 3, diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 20b5b12d4b..991f0930f3 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 31, "y": 3, "elevation": 4, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 32, "y": 16, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 32, "y": 10, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 14, "elevation": 4, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 8, "y": 10, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 9, "y": 16, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 25, "y": 8, "elevation": 3, diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 676081aa35..3511822fd9 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index e5483d9445..6fc0ff6a9d 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WINONA", + "graphics_id": "OBJ_EVENT_GFX_WINONA", "x": 15, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 4, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 5, "y": 17, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 9, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 15, "y": 21, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 4, "y": 23, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 10, "elevation": 3, diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index c67a599e72..44bbb2d3d6 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 2, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index ca3d48ff67..21fb09b521 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 2, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 923b8ee396..71b8eef43a 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 0, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index b3bdea382f..7eda47251e 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 1, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 52805ad532..8b6b64bbc5 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 6, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index 29ba47cb5c..4c3f311b1e 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 8, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index 1d85a0a800..045f4f82bc 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 8, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index c0b6d1f183..12db0e3671 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index 667e390e40..e5eec44c6b 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 9, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 7, "elevation": 3, diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index f67dbac6bf..83469027d5 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 21, "elevation": 3, diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 60914f2249..6aca4b1e09 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 5, "y": 14, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 14, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 2, "y": 16, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 7, "y": 12, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 4, "y": 22, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 6, "y": 22, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 21, "elevation": 3, diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 8d9a7b4d9e..c471a8f551 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 7, "y": 8, "elevation": 3, diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 0456f5eafd..9b3cbfcdbb 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -42,13 +42,13 @@ GraniteCave_StevensRoom_EventScript_StevenExitNorth:: @ 822DD0D return GraniteCave_StevensRoom_EventScript_StevenExitWestEast:: @ 822DD18 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit + applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit waitmovement 0 return GraniteCave_StevensRoom_EventScript_StevenExitSouth:: @ 822DD2A - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit + applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit applymovement 1, GraniteCave_StevensRoom_Movement_StevenExitSouth waitmovement 0 return diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 2dad355ec6..25c361ee6d 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 0, "y": 0, "elevation": 8, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 0, "y": 3, "elevation": 8, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 2, "y": 3, "elevation": 8, diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index e6cb5856b2..861b7d04ab 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGICE", + "graphics_id": "OBJ_EVENT_GFX_REGICE", "x": 8, "y": 7, "elevation": 3, diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index ddb8b8f371..c3237ece35 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 10, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 16, "y": 35, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 24, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 9, "y": 21, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 16, "y": 19, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 14, "y": 25, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 18, "y": 25, "elevation": 3, diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 7c0303036c..428809e765 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -21,7 +21,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 8, "y": 7, "elevation": 3, @@ -34,7 +34,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 1, "elevation": 3, @@ -47,7 +47,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 5, "y": 8, "elevation": 3, @@ -60,7 +60,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 10, "y": 13, "elevation": 3, @@ -73,7 +73,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN", "x": 4, "y": 4, "elevation": 3, @@ -86,7 +86,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -99,7 +99,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 6, "y": 16, "elevation": 3, @@ -112,7 +112,7 @@ "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 12, "y": 15, "elevation": 0, @@ -125,7 +125,7 @@ "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 4, "y": 7, "elevation": 3, diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index dc45f94d44..0939bfe401 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -134,7 +134,7 @@ LavaridgeTown_EventScript_RivalExitHerbShop:: @ 81EA65C waitmovement 0 applymovement 8, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -149,7 +149,7 @@ LavaridgeTown_EventScript_RivalApproachPlayer2:: @ 81EA6AC return LavaridgeTown_EventScript_RivalExit1:: @ 81EA6B7 - applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit + applymovement OBJ_EVENT_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit applymovement 7, LavaridgeTown_Movement_RivalExit1 waitmovement 0 return diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 99f2c33ffe..20866ced90 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FLANNERY", + "graphics_id": "OBJ_EVENT_GFX_FLANNERY", "x": 13, "y": 9, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 2, "y": 15, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 5, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 12, "y": 16, "elevation": 3, diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 8e3ae0260e..05aa18d006 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 4, "y": 18, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 6, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 13, "y": 17, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 16, "elevation": 3, diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 905c9aaba8..bf0abf5210 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 7, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 04d735f8d0..d40f639fd9 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 2, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 6, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index ca2630ebaa..929220a5bd 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 4, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 0522494a23..c8cd0d985f 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 11, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 6, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 1, "y": 3, "elevation": 3, diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index bc345bddda..53493ecf5b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index ca20cb74a1..5713bcce4a 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 32, "y": 20, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 15, "y": 18, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 28, "y": 28, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 21, "y": 15, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 16, "y": 9, "elevation": 5, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 35, "y": 27, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 35, "y": 37, "elevation": 5, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 34, "y": 37, "elevation": 5, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 57, "y": 17, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 73, "y": 15, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 61, "y": 36, "elevation": 5, @@ -169,7 +169,7 @@ "flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 43, "y": 18, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 46, "y": 12, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 45, "y": 12, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 38, "y": 9, "elevation": 5, @@ -221,7 +221,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 50, "y": 7, "elevation": 5, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 27, "y": 7, "elevation": 5, @@ -247,7 +247,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 16, "y": 23, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 41, "y": 25, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 40, "y": 25, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 16, "y": 34, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 16, "y": 35, "elevation": 3, diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 38a9bfd41c..8f2060acbc 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 30, "y": 30, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 11, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 40, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 12, "y": 22, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 15, "y": 22, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 25, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 25, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 25, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 16, "y": 25, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 8, "y": 24, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 18, "y": 24, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 24, "y": 10, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 27, "y": 10, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 22, "y": 13, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 24, "y": 13, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 26, "y": 13, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 28, "y": 13, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 20, "y": 10, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 30, "y": 11, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 8, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 13, "y": 20, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 36, "y": 22, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 39, "y": 22, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 34, "y": 25, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 36, "y": 25, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 38, "y": 25, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 40, "y": 25, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 32, "y": 23, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 37, "y": 20, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 42, "y": 24, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 23, "y": 26, "elevation": 3, diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index b2795ff3cf..c26e002a30 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 14, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 15, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 26, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 9, "y": 1, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 18, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 4, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 3, "y": 4, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 13, "y": 10, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 23, "y": 8, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 28, "y": 9, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 21, "y": 1, "elevation": 0, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 5, "y": 6, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 0, "y": 8, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 8, "y": 7, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 22, "y": 9, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 26, "y": 5, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 24, "y": 9, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 27, "y": 3, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 28, "y": 3, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 28, "y": 7, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_2", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_2", "x": 26, "y": 7, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 27, "y": 7, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 26, "y": 3, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 26, "y": 5, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 9, "y": 10, "elevation": 3, diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index ecd8e2b95e..ff79dd53af 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -38,7 +38,7 @@ LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264 addobject 4 applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer waitmovement 4 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceArtist + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceArtist waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT lockall @@ -212,7 +212,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436 addobject 11 applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer waitmovement 11 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT lockall @@ -424,12 +424,12 @@ LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: @ 821A670 delay 20 applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_ComeThroughHere, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall waitmovement 0 releaseall return @@ -947,7 +947,7 @@ LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49 delay 20 applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist waitmovement 0 messageautoscroll LilycoveCity_ContestLobby_Text_ComeThroughHere waitmessage @@ -955,7 +955,7 @@ LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49 closemessage call LilycoveCity_ContestLobby_EventScript_DelayIfContestWithRSPlayer applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall waitmovement 0 release return diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 6260eac154..46c75669ae 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 3f97cc5972..49008b035d 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -44,11 +44,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV:: @ 8218211 waitmovement 0 applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer waitmovement 0 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index b73679a44b..217d7164b5 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 10, "y": 3, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 7, "y": 3, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 1, "y": 7, "elevation": 3, diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 572e018745..6d9c85a8b0 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 5, "elevation": 3, diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 91a94af6d2..d2577184f1 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN", "x": 6, "y": 1, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 15, "y": 5, "elevation": 3, diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 8857d3bd1b..4787b811d2 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 14, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 4, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 3, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index c179d1fd51..ac1dda145d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 8, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 0, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 6, "elevation": 3, diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index 850b0175bb..55f543df6d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 0, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 7, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 13, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 8, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 2, "elevation": 3, diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index 106d10327f..4575903a12 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 0, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index fe82bd3a0f..fd352ea6d3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 1, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 15, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 17, "y": 6, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index d402e1517f..a64da745af 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, "elevation": 1, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 13, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 8, "y": 10, "elevation": 3, diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index cf273bcb81..31b33761e7 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -364,7 +364,7 @@ LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514 compare VAR_FACING, DIR_EAST call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call Common_EventScript_FerryDepart return @@ -428,18 +428,18 @@ LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC compare VAR_FACING, DIR_EAST call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call Common_EventScript_FerryDepart return LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast:: @ 821E610 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast waitmovement 0 return LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth:: @ 821E61B - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth waitmovement 0 return @@ -520,14 +520,14 @@ LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: @ 821E696 LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth:: @ 821E6A1 applymovement 5, LilycoveCity_Harbor_Movement_BrineyBoardFerry - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth applymovement 4, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth waitmovement 0 return LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast:: @ 821E6BA applymovement 5, LilycoveCity_Harbor_Movement_BrineyBoardFerry - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast applymovement 4, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast waitmovement 0 return diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index 51951bd01c..678ec2ec56 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 4, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 359206ad08..78690ae813 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 0, "y": 4, "elevation": 3, diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index f10334edce..9149d65955 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 1, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 2, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 2, "y": 3, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 61dcd58f80..94f97588ac 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 1, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 54cf821c9d..339f2c9c56 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 5, "y": 12, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 13, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 13, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 2, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 3, "y": 8, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 3, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 19, "y": 3, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index a9c6f12668..998cd2897c 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -47,7 +47,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: @ 8218D1E LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: @ 8218D5A lockall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate @@ -55,7 +55,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: @ 8218D5A LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: @ 8218D6F lockall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate @@ -63,7 +63,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: @ 8218D6F LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast:: @ 8218D84 lockall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index f486507a46..20330b12f8 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 10, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 19, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 7, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 4279d30640..6d0c12c9c6 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -63,17 +63,17 @@ LilycoveCity_LilycoveMuseum_2F_OnFrame: @ 82197FE LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall:: @ 8219808 lockall applymovement 1, Common_Movement_FacePlayer - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall, MSGBOX_SIGN applymovement 1, Common_Movement_FacePlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index ede184d570..d2a1d13206 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 0ad98c8d24..413c1ffd6e 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 10, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 11, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 1, "y": 3, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index a2fb65a398..e1c94bef22 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index 93a8159f9c..961d34831d 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 6, "y": 11, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 5, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 7, "y": 11, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 1, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_FANCLUB_BOY" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 10, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_FANCLUB_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 10, "y": 10, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_FANCLUB_OLD_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 039fb64139..b76f96b30a 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -17,12 +17,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 821C79A applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer waitmovement 0 diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index 56249cb509..236ded9154 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -21,7 +21,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 16, "y": 10, "elevation": 3, @@ -34,7 +34,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 12, "y": 13, "elevation": 3, @@ -47,7 +47,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 14, "y": 17, "elevation": 3, @@ -60,7 +60,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 5, "y": 8, "elevation": 3, @@ -73,7 +73,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE" }, { - "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "graphics_id": "OBJ_EVENT_GFX_TRUCK", "x": 2, "y": 10, "elevation": 4, @@ -86,7 +86,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK" }, { - "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "graphics_id": "OBJ_EVENT_GFX_TRUCK", "x": 11, "y": 10, "elevation": 4, @@ -99,7 +99,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 13, "y": 10, "elevation": 3, @@ -112,7 +112,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 14, "y": 10, "elevation": 3, diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index cb2589ed25..1726c8132b 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -143,7 +143,7 @@ LittlerootTown_EventScript_StepOffTruckFemale:: @ 81E7EF9 LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17 delay 15 playse SE_DANSA - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim @@ -158,16 +158,16 @@ LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17 msgbox LittlerootTown_Text_OurNewHomeLetsGoInside, MSGBOX_DEFAULT closemessage applymovement 4, LittlerootTown_Movement_MomApproachDoor - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerApproachDoor + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PlayerApproachDoor waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 4, LittlerootTown_Movement_MomEnterHouse - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerEnterHouse + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PlayerEnterHouse waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setvar VAR_LITTLEROOT_INTRO_STATE, 3 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN @@ -307,7 +307,7 @@ LittlerootTown_EventScript_DangerousWithoutPokemon:: @ 81E80AD msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_TwinPushPlayerFromRoute - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PushPlayerBackFromRoute + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PushPlayerBackFromRoute waitmovement 0 msgbox LittlerootTown_Text_DangerousIfYouDontHavePokemon, MSGBOX_DEFAULT closemessage @@ -389,7 +389,7 @@ LittlerootTown_EventScript_GoSaveBirchTrigger:: @ 81E811F lockall applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT @@ -560,70 +560,70 @@ LittlerootTown_EventScript_MomApproachPlayerFemale:: @ 81E82F0 return LittlerootTown_EventScript_MomApproachPlayer0:: @ 81E8333 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayer0 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayer1:: @ 81E8348 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayer1 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerMale2:: @ 81E835D - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale2 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerMale3:: @ 81E8372 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale3 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerMale4:: @ 81E8387 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale4 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerMale5:: @ 81E839C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale5 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerFemale2:: @ 81E83B1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale2 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerFemale3:: @ 81E83C6 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale3 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerFemale4:: @ 81E83DB - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale4 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerFemale5:: @ 81E83F0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale5 waitmovement 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 9536daa09f..f0e881ec1b 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 2, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX", + "graphics_id": "OBJ_EVENT_GFX_VIGOROTH_CARRYING_BOX", "x": 1, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY", + "graphics_id": "OBJ_EVENT_GFX_VIGOROTH_FACING_AWAY", "x": 4, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 2, "y": 7, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 5, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 1, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 8, "y": 8, "elevation": 3, diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index ee8d67cd99..09b4ce152b 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -63,7 +63,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814 lockall msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs waitmovement 0 warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 @@ -96,7 +96,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 81F785E waitmovement 0 applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach waitmovement 0 special GetRivalSonDaughterString @@ -183,7 +183,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2 end LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan:: @ 81F7981 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -229,19 +229,19 @@ LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2: @ 81F79B9 step_end LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs0:: @ 81F79C1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1:: @ 81F79D3 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2:: @ 81F79E5 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2 waitmovement 0 return diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 7ea29e671b..34ab799820 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 1, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 4, @@ -106,7 +106,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, "y": 0, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 1, "elevation": 0, @@ -132,7 +132,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 2, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 3, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 4, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 5, "elevation": 0, @@ -184,7 +184,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 7, "y": 1, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 4, "elevation": 0, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_SWABLU_DOLL", + "graphics_id": "OBJ_EVENT_GFX_SWABLU_DOLL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 101e2bbad1..4f673a7be1 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -93,11 +93,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497 LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth waitmovement 0 return @@ -105,11 +105,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507 LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth waitmovement 0 return @@ -117,11 +117,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536 LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest waitmovement 0 return @@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565 LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: @ 81F8594 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index a549eccc33..16b1eac73a 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 8, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY", + "graphics_id": "OBJ_EVENT_GFX_VIGOROTH_FACING_AWAY", "x": 6, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX", + "graphics_id": "OBJ_EVENT_GFX_VIGOROTH_CARRYING_BOX", "x": 9, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 8, "y": 7, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 5, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 9, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_MAY_NORMAL", "x": 2, "y": 8, "elevation": 3, diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index f016031df5..2a4b653d35 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -62,7 +62,7 @@ LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964 lockall msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs applymovement 1, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs waitmovement 0 warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 @@ -95,7 +95,7 @@ LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE waitmovement 0 applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement 4, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach waitmovement 0 special GetRivalSonDaughterString @@ -217,7 +217,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B end LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay:: @ 81F8B2A - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -263,19 +263,19 @@ LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: @ 81F8B62 step_end LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0:: @ 81F8B6A - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0 applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0 waitmovement 0 return LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1:: @ 81F8B7C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1 applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1 waitmovement 0 return LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2:: @ 81F8B8E - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2 applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2 waitmovement 0 return diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index b2ac8ca0b9..7366f9241c 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_MAY_NORMAL", "x": 1, "y": 1, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 6, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 1, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 2, "y": 6, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 3, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 4, "y": 6, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 5, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 7, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 7, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 2, "y": 7, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 3, "y": 7, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 4, "y": 7, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 5, "y": 7, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 1, "y": 1, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_PICHU_DOLL", + "graphics_id": "OBJ_EVENT_GFX_PICHU_DOLL", "x": 3, "y": 4, "elevation": 4, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 4, "elevation": 0, diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 5bfbfbbcdc..d407408357 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -93,11 +93,11 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth waitmovement 0 return @@ -105,11 +105,11 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth waitmovement 0 return @@ -117,7 +117,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9 LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage @@ -128,11 +128,11 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418 LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: @ 81F9440 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast waitmovement 0 return diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index b6e4e2c0c3..0454c170af 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 9, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 7, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 8, "elevation": 3, diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index b27cb1f8ad..75c963095a 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -63,11 +63,11 @@ LittlerootTown_ProfessorBirchsLab_OnWarp: @ 81F9D06 .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter:: @ 81F9D40 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade:: @ 81F9D45 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH addobject 2 addobject 3 turnobject 3, DIR_NORTH @@ -153,7 +153,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival:: @ 81F9E48 LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent:: @ 81F9E67 lockall - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex waitmovement 0 goto LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex end @@ -185,7 +185,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 playse SE_TK_KASYA delay 20 applymovement 3, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 checkplayergender compare VAR_RESULT, MALE @@ -198,7 +198,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex waitmovement 0 applymovement 3, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -261,7 +261,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex: @ 81F9F58 LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter:: @ 81F9F62 lockall - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5 @@ -546,7 +546,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index bc96ab846f..98436b4dac 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 4, "y": 5, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 20, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 30, "y": 20, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 22, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 22, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 23, "elevation": 3, diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index 7760094081..c30fcf3178 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 18, "y": 19, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 12, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 8, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 21, "y": 11, "elevation": 3, diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index 1adf44511d..164da412f1 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 29, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 25, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 21, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 8, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 7, "y": 13, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index e381630c0c..600e194adb 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 2, "y": 7, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 21, "y": 21, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 16, "elevation": 0, diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index b2a316f4e8..c5ed02b66d 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 16, "y": 3, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 9, "elevation": 0, diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json index a0e32eca54..49d176ade5 100644 --- a/data/maps/MagmaHideout_3F_3R/map.json +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 19, "elevation": 0, diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index 11f7f2fa32..93d78e243b 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GROUDON_1", + "graphics_id": "OBJ_EVENT_GFX_GROUDON_1", "x": 16, "y": 17, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 31, "y": 22, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 30, "y": 13, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 26, "y": 13, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 22, "y": 4, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 16, "y": 21, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_GROUDON_2", + "graphics_id": "OBJ_EVENT_GFX_GROUDON_2", "x": 16, "y": 17, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 7, "elevation": 0, diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 08b59e1f05..5a5e9ebf97 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -15,7 +15,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560 playfanfare MUS_ME_TAMA playse SE_TAMA special DoOrbEffect - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 removeobject 7 @ sleeping Groudon @@ -47,7 +47,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_MaxieGroudonWhatsWrong, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement 6, Common_Movement_FacePlayer diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index 969d7b55af..435d0d7831 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1", + "graphics_id": "OBJ_EVENT_GFX_KYOGRE_1", "x": 9, "y": 22, "elevation": 1, diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 0050af939f..3398ae1182 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -25,7 +25,7 @@ MarineCave_End_EventScript_ShowKyogre:: @ 823B012 MarineCave_End_EventScript_Kyogre:: @ 823B01B lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, MarineCave_End_Movement_KyogreApproach waitmovement 0 diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index a09618d047..713c0553a4 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -36,7 +36,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 29, "y": 16, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 24, "y": 10, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 11, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 18, "y": 6, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 17, "y": 14, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 8, "y": 6, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 9, "y": 6, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE" }, { - "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "graphics_id": "OBJ_EVENT_GFX_WATTSON", "x": 29, "y": 9, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 19, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, "y": 7, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 12, "y": 14, "elevation": 3, diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 3410664a19..745cd13b74 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -114,19 +114,19 @@ MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD end MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1 + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1 applymovement 6, MauvilleCity_Movement_WallyExitNorth1 applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth1 waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerNorth waitmovement 0 msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2 + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2 applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth2 applymovement 6, MauvilleCity_Movement_WallyExitNorth2 waitmovement 0 @@ -134,7 +134,7 @@ MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0 end MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1 + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1 applymovement 6, MauvilleCity_Movement_WallyExitEast1 applymovement 7, MauvilleCity_Movement_WallysUncleExitEast1 waitmovement 0 @@ -145,7 +145,7 @@ MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D waitmovement 0 msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2 + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2 applymovement 7, MauvilleCity_Movement_WallysUncleExitEast2 applymovement 6, MauvilleCity_Movement_WallyExitEast2 waitmovement 0 @@ -164,7 +164,7 @@ MauvilleCity_EventScript_DefeatedWally:: @ 81DF593 call_if_eq MauvilleCity_EventScript_ScottApproachPlayerNorth compare VAR_FACING, DIR_EAST call_if_eq MauvilleCity_EventScript_ScottApproachPlayerEast - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT closemessage @@ -191,13 +191,13 @@ MauvilleCity_EventScript_ScottApproachPlayerEast:: @ 81DF601 return MauvilleCity_EventScript_ScottExitNorth:: @ 81DF616 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth applymovement 11, MauvilleCity_Movement_ScottExitNorth waitmovement 0 return MauvilleCity_EventScript_ScottExitEast:: @ 81DF628 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast applymovement 11, MauvilleCity_Movement_ScottExitEast waitmovement 0 return diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 4e95779685..5f31275d0b 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 2, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 6, "elevation": 3, diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index c0b450f226..416ed44b50 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 11, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 7, "y": 3, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 19, "y": 4, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 20, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 6, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 13, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 1, "y": 7, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 9, "y": 8, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 6, "elevation": 3, diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index c2ac492833..56372cd732 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "graphics_id": "OBJ_EVENT_GFX_WATTSON", "x": 5, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAUVILLE_GYM_WATTSON" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 1, "y": 16, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 5, "y": 10, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 13, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 20, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 7, "y": 10, "elevation": 3, diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index b51016cbda..96fdc1896e 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 5751183e7a..1cac7e6e0c 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 8521e5d1d7..d0f64ef001 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 8647fd8c80..a017b14b28 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 2, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 8, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 11, "y": 4, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 8, "elevation": 3, diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index e4c76a7bd2..7ea0ab81b9 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 8, "y": 8, "elevation": 3, diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index e4933a07e6..9559338681 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 12, "y": 20, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 14, "y": 21, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 6, "y": 20, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 20, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 21, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 13, "y": 23, "elevation": 3, diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index ad3eb3eb8a..c86d50d4dc 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -16,7 +16,7 @@ MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F lockall playbgm MUS_MGM0, 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 applymovement 5, Common_Movement_WalkInPlaceDown @@ -37,7 +37,7 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Common_Movement_WalkInPlaceFastestLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 @@ -54,7 +54,7 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay + applymovement OBJ_EVENT_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit applymovement 6, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit waitmovement 0 diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 3280695ca9..49843aa4a1 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 13, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 6, "y": 12, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 7, "y": 12, "elevation": 3, diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index ee282dc16f..e874f14526 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index ba720f6517..703d8d2819 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 19, "y": 3, "elevation": 3, diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json index ea1db23441..3ed25e6c45 100644 --- a/data/maps/MirageTower_3F/map.json +++ b/data/maps/MirageTower_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index c25fb01527..0574954972 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 5, "y": 4, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 7, "y": 4, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 6, "y": 7, "elevation": 3, diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index e3b1af96b3..7456a454ac 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 38, "y": 12, "elevation": 5, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 50, "y": 34, "elevation": 5, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 32, "y": 12, "elevation": 5, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 26, "y": 21, "elevation": 5, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 45, "y": 18, "elevation": 7, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 62, "y": 35, "elevation": 5, @@ -109,7 +109,7 @@ "flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 55, "y": 5, "elevation": 7, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 56, "y": 21, "elevation": 7, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 23, "y": 13, "elevation": 5, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 23, "elevation": 5, @@ -161,7 +161,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 24, "elevation": 5, @@ -174,7 +174,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 25, "elevation": 5, @@ -187,7 +187,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 26, "elevation": 5, @@ -200,7 +200,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 45, "y": 25, "elevation": 5, @@ -213,7 +213,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 19, "y": 25, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 61, "y": 29, "elevation": 5, @@ -239,7 +239,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 31, "y": 29, "elevation": 3, diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index fe12da311d..c701bf45b2 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -265,13 +265,13 @@ MossdeepCity_EventScript_Scott:: @ 81E4C85 end MossdeepCity_EventScript_ScottExitNorth:: @ 81E4CB0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit applymovement 16, MossdeepCity_Movement_ScottExitNorth waitmovement 0 return MossdeepCity_EventScript_ScottExitEast:: @ 81E4CC2 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit applymovement 16, MossdeepCity_Movement_ScottExitEast waitmovement 0 return diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index 3e64c45fda..dbc1180e1d 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 2, "elevation": 0, diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index f10456fdef..c1c046c38b 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index d068a92e37..3e57e496b7 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TATE", + "graphics_id": "OBJ_EVENT_GFX_TATE", "x": 23, "y": 7, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 1, "y": 30, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 5, "y": 20, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 29, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 23, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 6, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 6, "y": 3, "elevation": 0, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 5, "y": 33, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LIZA", + "graphics_id": "OBJ_EVENT_GFX_LIZA", "x": 24, "y": 7, "elevation": 0, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 2, "y": 30, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 1, "y": 29, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 4, "y": 30, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 5, "y": 29, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 5, "y": 21, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 7, "y": 9, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 10, "y": 8, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 8, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 7, "y": 5, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 6, "y": 6, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 12, "y": 5, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 11, "y": 5, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 11, "y": 34, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 12, "y": 33, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 12, "y": 34, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 22, "y": 25, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 23, "y": 26, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 25, "y": 25, "elevation": 0, @@ -366,7 +366,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 22, "y": 23, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 21, "y": 23, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 21, "y": 22, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 22, "y": 22, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 25, "y": 22, "elevation": 3, @@ -431,7 +431,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 24, "y": 22, "elevation": 3, @@ -444,7 +444,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 24, "y": 23, "elevation": 3, @@ -457,7 +457,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 6, "y": 5, "elevation": 3, @@ -470,7 +470,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 23, "y": 25, "elevation": 3, diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index ec5e2bb704..1e2bdee3a6 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -117,7 +117,7 @@ MossdeepCity_Gym_EventScript_Switch1:: @ 8220999 lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_ClearSwitch1 setflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0 setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1 @@ -132,7 +132,7 @@ MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 82209C8 MossdeepCity_Gym_EventScript_ClearSwitch1:: @ 82209D0 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Left, 0 setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Up, 1 @@ -143,7 +143,7 @@ MossdeepCity_Gym_EventScript_Switch2:: @ 82209F5 lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_ClearSwitch2 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0 setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1 @@ -152,7 +152,7 @@ MossdeepCity_Gym_EventScript_Switch2:: @ 82209F5 MossdeepCity_Gym_EventScript_ClearSwitch2:: @ 8220A24 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Down, 0 setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Up, 1 @@ -163,7 +163,7 @@ MossdeepCity_Gym_EventScript_Switch3:: @ 8220A49 lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_ClearSwitch3 setflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0 setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1 @@ -172,7 +172,7 @@ MossdeepCity_Gym_EventScript_Switch3:: @ 8220A49 MossdeepCity_Gym_EventScript_ClearSwitch3:: @ 8220A78 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Right, 0 setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Up, 1 @@ -183,7 +183,7 @@ MossdeepCity_Gym_EventScript_Switch4:: @ 8220A9D lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_ClearSwitch4 setflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0 setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1 @@ -192,7 +192,7 @@ MossdeepCity_Gym_EventScript_Switch4:: @ 8220A9D MossdeepCity_Gym_EventScript_ClearSwitch4:: @ 8220ACC clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Right, 0 setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Up, 1 diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index 019b7f7a27..01a896163a 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index bc917dcbd3..37007f0eba 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 6, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 4, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index d5c812a734..233f543cc2 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 3161c18468..028be796f6 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 6, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 423ca5a195..25cc618ee9 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 1, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 8, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index c6c5cf2e96..b198aeeb48 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index d78833d965..b6cf6280bd 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 11, "y": 7, "elevation": 3, diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index b59688e911..b67d21f0ec 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 10, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 14, "y": 7, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 12, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 11, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 10, "y": 2, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 13, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 2, "y": 5, "elevation": 0, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 1, "y": 4, "elevation": 3, diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index bb98ffb223..d0aae6927a 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 6, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 5, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 1, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 12, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 13, "y": 3, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 14, "y": 2, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 0, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 1, "y": 9, "elevation": 3, diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 765b964823..97ae9c0448 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -32,16 +32,16 @@ MossdeepCity_SpaceCenter_2F_OnFrame: @ 8223DB5 MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts:: @ 8223DBF playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts msgbox MossdeepCity_SpaceCenter_2F_Text_GoodAnswer, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit waitmovement 0 warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 waitstate @@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_5, MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_6, MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_7, MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index de718e7060..56734b17ea 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 9, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index a80bfc3cd2..46ef77cf67 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 24, "y": 19, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 13, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 12, "y": 11, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 32, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 28, "y": 12, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 19, "y": 39, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 29, "y": 5, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 31, "y": 12, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 19, "y": 39, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 22, "y": 39, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 19, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 18, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 23, "y": 17, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 20, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 22, "y": 19, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 23, "y": 21, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 21, "y": 19, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 30, "y": 12, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 29, "y": 12, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 30, "y": 5, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 31, "y": 5, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 9, "y": 16, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 20, "y": 39, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 21, "y": 39, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 16, "y": 18, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 7, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 29, "y": 7, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 27, "y": 17, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 13, "y": 16, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 7, "y": 7, "elevation": 3, diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index a70d7e3ae7..cafadf17c2 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -60,7 +60,7 @@ MtChimney_EventScript_Maxie:: @ 822EE0B call_if_eq MtChimney_EventScript_ArchieApproachPlayerEast compare VAR_FACING, DIR_NORTH call_if_eq MtChimney_EventScript_ArchieApproachPlayerNorth - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MtChimney_Text_ArchieThankYou, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 625fa7f4be..1894d41e5c 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CAR", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 32064ad040..8c42941267 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -19,7 +19,7 @@ MtChimney_CableCarStation_OnFrame: @ 822AC1D MtChimney_CableCarStation_EventScript_ExitCableCar:: @ 822AC27 lockall - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_ExitCableCar + applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_ExitCableCar applymovement 1, MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 @@ -42,7 +42,7 @@ MtChimney_CableCarStation_EventScript_RideCableCar:: @ 822AC6C msgbox MtChimney_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT closemessage applymovement 1, MtChimney_CableCarStation_Movement_LeadPlayerToCableCar - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_BoardCableCar + applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_BoardCableCar waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 862988960e..52f07f630d 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 21, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 17, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 13, "y": 10, "elevation": 3, diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index 59ed69806f..124719bbb5 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 3, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 9, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 12, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 2, "y": 9, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 3, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 9, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index ff9fc3822b..67fdeddc1b 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 1, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 11, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index 8b20b5125f..7db90d71b5 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 11, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 61f412cb0c..f1cfedcb0f 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 11, "elevation": 3, diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index d376fab123..c67582a8c0 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 6, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 9, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 1a6eb4758e..ff4c5b8fae 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 15, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 40, "elevation": 3, diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 7e4b8e33d4..f7eab7e529 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 22, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 23, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 23, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 21, "y": 15, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 25, "y": 18, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 21, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 25, "y": 11, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 23, "y": 6, "elevation": 3, diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 577b870764..18ebc4ff75 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -32,7 +32,7 @@ MtPyre_Summit_EventScript_TeamAquaTrigger2:: @ 8232030 MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestDown waitmovement 0 @@ -87,7 +87,7 @@ MtPyre_Summit_EventScript_ArchieFacePlayer2:: @ 82320EC MtPyre_Summit_EventScript_OldLadyApproachPlayer0:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -99,7 +99,7 @@ MtPyre_Summit_EventScript_OldLadyApproachPlayer1:: @ 823210C MtPyre_Summit_EventScript_OldLadyApproachPlayer2:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -208,7 +208,7 @@ MtPyre_Summit_EventScript_ArchieMaxieTrigger2:: @ 8232204 end MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -248,49 +248,49 @@ MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: @ 8232210 end MtPyre_Summit_EventScript_ArchieMaxieBeginExit0:: @ 82322C4 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0 + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0 applymovement 2, MtPyre_Summit_Movement_MaxieExit applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return MtPyre_Summit_EventScript_ArchieMaxieBeginExit1:: @ 82322DD - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1 + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1 applymovement 2, MtPyre_Summit_Movement_MaxieExit applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return MtPyre_Summit_EventScript_ArchieMaxieBeginExit2:: @ 82322F6 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2 + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2 applymovement 2, MtPyre_Summit_Movement_MaxieExit applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachPlayer0:: @ 823230F - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie0 + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie0 applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer0 waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachPlayer1:: @ 8232328 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer1 waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachPlayer2:: @ 8232341 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer2 waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachArchie0:: @ 823235A - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie0 waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestRight @@ -298,7 +298,7 @@ MtPyre_Summit_EventScript_MaxieApproachArchie0:: @ 823235A return MtPyre_Summit_EventScript_MaxieApproachArchie1:: @ 8232376 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie1 waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestRight @@ -306,7 +306,7 @@ MtPyre_Summit_EventScript_MaxieApproachArchie1:: @ 8232376 return MtPyre_Summit_EventScript_MaxieApproachArchie2:: @ 8232392 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie2 waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestRight diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json index 9a7669224e..2d4a89bdb8 100644 --- a/data/maps/NavelRock_Bottom/map.json +++ b/data/maps/NavelRock_Bottom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LUGIA", + "graphics_id": "OBJ_EVENT_GFX_LUGIA", "x": 11, "y": 13, "elevation": 0, diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 1abd5a1ecd..a30f1c3860 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 5, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 7, "elevation": 1, diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index 4f7afda38a..f0e1bb8f83 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HOOH", + "graphics_id": "OBJ_EVENT_GFX_HOOH", "x": 12, "y": 4, "elevation": 0, diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index fcd043d3dc..4cb110d812 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -39,7 +39,7 @@ NavelRock_Top_EventScript_HoOh:: @ 826916F setvar VAR_0x8005, 35 @ delay special LoopWingFlapSE applymovement 1, NavelRock_Top_Movement_HoOhAppear - applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_CameraPanUp + applymovement OBJ_EVENT_ID_CAMERA, NavelRock_Top_Movement_CameraPanUp waitmovement 0 delay 50 setweather WEATHER_NONE @@ -52,7 +52,7 @@ NavelRock_Top_EventScript_HoOh:: @ 826916F setvar VAR_0x8004, 3 @ num loops setvar VAR_0x8005, 35 @ delay special LoopWingFlapSE - applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_CameraPanDown + applymovement OBJ_EVENT_ID_CAMERA, NavelRock_Top_Movement_CameraPanDown applymovement 1, NavelRock_Top_Movement_HoOhApproach waitmovement 0 special RemoveCameraObject diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index e9369b7eac..6d7d731de4 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,7 +23,7 @@ NewMauville_Entrance_OnTransition: @ 82372FB NewMauville_Entrance_EventScript_Door:: @ 82372FF lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox NewMauville_Entrance_Text_DoorIsLocked, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 34078353c7..296ee07db7 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 25, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 22, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 11, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 18, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 11, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 10, "elevation": 3, diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 1644c76d6f..226ae0c722 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 16, "y": 11, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 13, "y": 7, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 9, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 19, "elevation": 3, diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 88f73d39bd..5084b31a48 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -50,20 +50,20 @@ OldaleTown_EventScript_MartEmployee:: @ 81E8EFC OldaleTown_EventScript_GoToMartSouth:: @ 81E8F47 applymovement 2, OldaleTown_Movement_EmployeeSouth - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerSouth + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerSouth waitmovement 0 goto OldaleTown_EventScript_ExplainPokemonMart end OldaleTown_EventScript_GoToMartNorth:: @ 81E8F5E applymovement 2, OldaleTown_Movement_EmployeeNorth - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerNorth + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerNorth waitmovement 0 goto OldaleTown_EventScript_ExplainPokemonMart end OldaleTown_EventScript_GoToMartEast:: @ 81E8F75 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerEast + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerEast applymovement 2, OldaleTown_Movement_EmployeeEast waitmovement 0 goto OldaleTown_EventScript_ExplainPokemonMart @@ -201,7 +201,7 @@ OldaleTown_EventScript_FootprintsMan:: @ 81E901F OldaleTown_EventScript_BlockedPath:: @ 81E903F lockall - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerStepBack + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerStepBack applymovement 3, OldaleTown_Movement_BackUp waitmovement 0 msgbox OldaleTown_Text_WaitDontComeInHere, MSGBOX_DEFAULT @@ -228,7 +228,7 @@ OldaleTown_EventScript_RivalTrigger1:: @ 81E9086 lockall applymovement 4, OldaleTown_Movement_RivalApproachPlayer1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_ShowRivalMessage @@ -238,7 +238,7 @@ OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6 lockall applymovement 4, OldaleTown_Movement_RivalApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_ShowRivalMessage @@ -248,7 +248,7 @@ OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6 lockall applymovement 4, OldaleTown_Movement_RivalApproachPlayer3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_ShowRivalMessage @@ -294,7 +294,7 @@ OldaleTown_EventScript_DoExitMovement1:: @ 81E9148 return OldaleTown_EventScript_DoExitMovement2:: @ 81E915E - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_WatchRivalExit + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_WatchRivalExit applymovement 4, OldaleTown_Movement_RivalExit waitmovement 0 return diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 42502742a0..6d9be59bdd 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index f2b1db4abb..1fe1f898ea 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index d287baec64..c3444f5804 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 8dada1ede9..5322efa63d 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 10, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 3, "y": 7, "elevation": 3, diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index e0811a74e8..2fd9bdcd88 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index c522bf8b75..4a50baf23b 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 10, "y": 23, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 11, "y": 14, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 9, "y": 16, "elevation": 3, diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index f3fa5a370a..91c0cd4065 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index de95d43155..597776ec9a 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 8, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 1, "y": 7, "elevation": 3, diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 066aec4bb8..76e6a3fcc9 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 3, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index ea5d3fa4b2..577f7bc5e6 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index 41328a6512..85d5bc2b7c 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 9, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 3f7f76cbe8..faa76da504 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 10, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 2, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 12, "y": 8, "elevation": 3, diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 4aa6c736dc..19e5e0930d 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 721234bd57..cad421008d 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 16, "y": 18, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 15, "y": 10, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "FLAG_HIDE_PETALBURG_CITY_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 20, "y": 10, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 15, "y": 10, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 2, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 28, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 15, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 13, "y": 12, "elevation": 3, diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 5d3bbf1efa..16977581c0 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -38,7 +38,7 @@ PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E special SavePlayerParty special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_WallyTutorialWally - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer waitmovement 0 msgbox Route102_Text_WatchMeCatchPokemon, MSGBOX_DEFAULT special StartWallyTutorialBattle @@ -63,17 +63,17 @@ PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390 lockall setflag FLAG_HIDE_MAP_NAME_POPUP applymovement 5, PetalburgCity_Movement_WalkToWallyHouseUncle - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer waitmovement 0 setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 5, PetalburgCity_Movement_WalkInsideHouseUncle - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer waitmovement 0 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_MAP_NAME_POPUP @@ -291,7 +291,7 @@ PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA call_if_eq PetalburgCity_EventScript_LeadPlayerToGym3 msgbox PetalburgCity_Text_ThisIsPetalburgGym, MSGBOX_DEFAULT applymovement 8, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT closemessage @@ -304,7 +304,7 @@ PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA PetalburgCity_EventScript_BoyApproachPlayer0:: @ 81DC57F applymovement 8, PetalburgCity_Movement_BoyApproachPlayer0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -316,38 +316,38 @@ PetalburgCity_EventScript_BoyApproachPlayer1:: @ 81DC594 PetalburgCity_EventScript_BoyApproachPlayer2:: @ 81DC59F applymovement 8, PetalburgCity_Movement_BoyApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_EventScript_BoyApproachPlayer3:: @ 81DC5B4 applymovement 8, PetalburgCity_Movement_BoyApproachPlayer3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_EventScript_LeadPlayerToGym0:: @ 81DC5C9 applymovement 8, PetalburgCity_Movement_BoyWalkToGym0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0 waitmovement 0 return PetalburgCity_EventScript_LeadPlayerToGym1:: @ 81DC5DB applymovement 8, PetalburgCity_Movement_BoyWalkToGym1 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1 waitmovement 0 return PetalburgCity_EventScript_LeadPlayerToGym2:: @ 81DC5ED applymovement 8, PetalburgCity_Movement_BoyWalkToGym2 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2 waitmovement 0 return PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF applymovement 8, PetalburgCity_Movement_BoyWalkToGym3 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3 waitmovement 0 return @@ -549,7 +549,7 @@ PetalburgCity_EventScript_Scott:: @ 81DC6E9 waitmovement 0 applymovement 9, PetalburgCity_Movement_ScottApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_SCOTT_STATE, 1 msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT @@ -578,25 +578,25 @@ PetalburgCity_EventScript_Scott:: @ 81DC6E9 end PetalburgCity_EventScript_ScottExit0:: @ 81DC78E - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0 applymovement 9, PetalburgCity_Movement_ScottExit0 waitmovement 0 return PetalburgCity_EventScript_ScottExit1:: @ 81DC7A0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1 applymovement 9, PetalburgCity_Movement_ScottExit1 waitmovement 0 return PetalburgCity_EventScript_ScottExit2:: @ 81DC7B2 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2 applymovement 9, PetalburgCity_Movement_ScottExit2 waitmovement 0 return PetalburgCity_EventScript_ScottExit3:: @ 81DC7C4 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3 applymovement 9, PetalburgCity_Movement_ScottExit3 waitmovement 0 return diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 1d71f69dda..4791eab6be 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 4, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 94, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 81, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 42, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 55, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 68, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 16, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 29, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 109, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 4, "y": 111, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 1, "y": 7, "elevation": 3, diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index d9f299db2c..90971f5317 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -79,7 +79,7 @@ PetalburgCity_Gym_OnWarp: @ 820498B .2byte 0 PetalburgCity_Gym_EventScript_TurnPlayerNorth:: @ 8204995 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PetalburgCity_Gym_OnFrame: @ 820499A @@ -91,14 +91,14 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4 msgbox PetalburgCity_Gym_Text_DadSoDidItWorkOut, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_WallyExitGym waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgCity_Gym_Text_DadGoCollectBadges, MSGBOX_DEFAULT setvar VAR_PETALBURG_GYM_STATE, 2 @@ -238,13 +238,13 @@ PetalburgCity_Gym_EventScript_WallyArriveNorth:: @ 8204C43 applymovement 10, PetalburgCity_Gym_Movement_WallyArriveNorth waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return @@ -252,25 +252,25 @@ PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: @ 8204C78 applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth:: @ 8204C91 applymovement 10, PetalburgCity_Gym_Movement_WallyExitNorth - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallyWest:: @ 8204CA3 applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: @ 8204CB5 applymovement 10, PetalburgCity_Gym_Movement_WallyExitEast - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast waitmovement 0 return @@ -281,19 +281,19 @@ PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: @ 8204CC7 PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: @ 8204CD2 applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: @ 8204CE4 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: @ 8204CF6 applymovement 1, Common_Movement_WalkInPlaceFastestLeft - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -523,7 +523,7 @@ PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2 PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -531,7 +531,7 @@ PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009 applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -539,7 +539,7 @@ PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009 PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025 applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -547,19 +547,19 @@ PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025 PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041 applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitNorth applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast:: @ 820505A applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitEast - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest:: @ 820506C applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitWest - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest waitmovement 0 return diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index cbff5d4b72..d163af603e 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 7, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 7509e66981..175ee2a85c 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 2, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index 9e843180af..f2b464c1f1 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 9, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 6, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index e6b4addb52..abf6a7b520 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 11, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index f2601e1b2c..fbd0726817 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index 3c0c42c5b1..765dae779b 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index 1516e33d26..5200ac02f4 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -8,7 +8,7 @@ PetalburgCity_WallysHouse_MapScript2_OnWarp: @ 8204234 .2byte 0 PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E - turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST + turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST turnobject 1, DIR_WEST end diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 8d1f278dff..e019208253 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 19, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 19, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 26, "y": 17, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 26, "y": 20, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 45, "y": 7, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 35, "y": 20, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 15, "y": 19, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 32, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 4, "y": 14, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 30, "y": 34, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 26, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 33, "y": 5, "elevation": 3, diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 4c53891fd1..0d968f45cd 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -30,7 +30,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7 applymovement 3, PetalburgWoods_Movement_AquaBackOff waitmovement 0 call PetalburgWoods_EventScript_DevonResearcherPostBattle - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave + applymovement OBJ_EVENT_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave applymovement 4, PetalburgWoods_Movement_DevonResearcherExitLeft waitmovement 0 goto PetalburgWoods_EventScript_RemoveDevonResearcher @@ -41,7 +41,7 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079 call PetalburgWoods_EventScript_DevonResearcherIntro applymovement 4, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage @@ -59,14 +59,14 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079 applymovement 4, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight waitmovement 0 msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe applymovement 3, PetalburgWoods_Movement_AquaBackOff waitmovement 0 call PetalburgWoods_EventScript_DevonResearcherPostBattle - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave + applymovement OBJ_EVENT_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave applymovement 4, PetalburgWoods_Movement_DevonResearcherExitRight waitmovement 0 goto PetalburgWoods_EventScript_RemoveDevonResearcher @@ -85,7 +85,7 @@ PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138 applymovement 3, PetalburgWoods_Movement_AquaRunAway waitmovement 0 removeobject 3 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 255e636ef4..1df6eab75d 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 18b5578e94..3fb1378302 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 16, "y": 8, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 9, "y": 13, "elevation": 0, @@ -52,7 +52,7 @@ "flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG", + "graphics_id": "OBJ_EVENT_GFX_BIRCHS_BAG", "x": 7, "y": 14, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_1", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_1", "x": 10, "y": 13, "elevation": 0, @@ -78,7 +78,7 @@ "flag": "FLAG_HIDE_ROUTE_101_ZIGZAGOON" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 5, "y": 11, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "FLAG_HIDE_ROUTE_101_BIRCH" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 2, "y": 13, "elevation": 3, diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index dca3dc47d0..3e84dfa85b 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -23,7 +23,7 @@ Route101_EventScript_StartBirchRescue:: @ 81EBCDE closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_EnterScene + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_EnterScene applymovement 2, Route101_Movement_BirchRunAway1 applymovement 4, Route101_Movement_PoochyenaChase1 waitmovement 0 @@ -45,7 +45,7 @@ Route101_EventScript_PreventExitSouth:: @ 81EBD4E lockall msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitSouth + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_PreventExitSouth waitmovement 0 releaseall end @@ -54,7 +54,7 @@ Route101_EventScript_PreventExitWest:: @ 81EBD64 lockall msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitWest + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_PreventExitWest waitmovement 0 releaseall end @@ -63,7 +63,7 @@ Route101_EventScript_PreventExitNorth:: @ 81EBD7A lockall msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitNorth + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_PreventExitNorth waitmovement 0 releaseall end @@ -222,8 +222,8 @@ Route101_EventScript_BirchsBag:: @ 81EBE16 setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 - setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special ChooseStarter waitstate diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 50fe8d0de3..017368f200 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 18, "y": 11, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 14, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 15, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 7, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 37, "y": 4, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 15, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "FLAG_ITEM_ROUTE_102_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 2, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 25, "y": 2, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 19, "y": 4, "elevation": 3, diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index b645cf502a..16ae2069e1 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 49, "y": 12, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 3, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "FLAG_HIDE_ROUTE_103_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 71, "y": 11, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 65, "y": 12, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 64, "y": 12, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 50, "y": 8, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 58, "y": 5, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 59, "y": 5, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 60, "y": 5, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 20, "y": 10, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 7, "y": 3, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "FLAG_HIDE_ROUTE_103_BIRCH" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 56, "y": 13, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 50, "y": 5, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 67, "y": 7, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 72, "y": 8, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 67, "y": 5, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 67, "y": 9, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 36, "y": 6, "elevation": 1, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 36, "y": 13, "elevation": 1, @@ -273,7 +273,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 64, "y": 7, "elevation": 0, diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index c614dae1cc..7c578c5b78 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -110,7 +110,7 @@ Route103_EventScript_RivalExit:: @ 81EC50A end Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D - applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth + applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth applymovement 2, Route103_Movement_RivalExitFacingNorth1 waitmovement 0 playse SE_DANSA @@ -120,7 +120,7 @@ Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D end Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561 - applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest + applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest applymovement 2, Route103_Movement_RivalExit1 waitmovement 0 playse SE_DANSA diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index f31c512f77..7020232def 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 15, "y": 60, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 25, "y": 49, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 31, "y": 24, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 27, "y": 63, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 30, "y": 50, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 28, "y": 74, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 12, "y": 54, "elevation": 1, @@ -122,7 +122,7 @@ "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 51, "elevation": 4, @@ -135,7 +135,7 @@ "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 29, "y": 8, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 34, "y": 6, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 6, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 6, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 22, "y": 41, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 23, "y": 41, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 41, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 37, "y": 8, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 22, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 23, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 24, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 25, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 15, "elevation": 3, @@ -304,7 +304,7 @@ "flag": "FLAG_ITEM_ROUTE_104_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 19, "elevation": 3, @@ -317,7 +317,7 @@ "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 27, "y": 15, "elevation": 3, @@ -330,7 +330,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 28, "y": 15, "elevation": 3, @@ -343,7 +343,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 21, "y": 25, "elevation": 3, @@ -356,7 +356,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 44, "elevation": 3, @@ -369,7 +369,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 53, "elevation": 3, @@ -382,7 +382,7 @@ "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 18, "y": 67, "elevation": 3, @@ -395,7 +395,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 22, "elevation": 3, @@ -408,7 +408,7 @@ "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 35, "y": 22, "elevation": 3, @@ -421,7 +421,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 8, "elevation": 3, @@ -434,7 +434,7 @@ "flag": "FLAG_ITEM_ROUTE_104_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 26, "elevation": 3, @@ -447,7 +447,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 15, "y": 59, "elevation": 3, @@ -460,7 +460,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 17, "y": 50, "elevation": 0, diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 46dd80119f..3294a29924 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -51,12 +51,12 @@ Route104_EventScript_RivalTrigger:: @ 81ECCB3 setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 10 addobject 34 clearflag FLAG_HIDE_ROUTE_104_RIVAL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBackUp + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBackUp waitmovement 0 applymovement 34, Route104_Movement_RivalExitBrineysCottage waitmovement 0 @@ -108,7 +108,7 @@ Route104_EventScript_MayEncounter:: @ 81ECD4B closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival applymovement 34, Route104_Movement_RivalWalkSlowLeft msgbox Route104_Text_MayHowsYourPokedex, MSGBOX_DEFAULT closemessage @@ -197,7 +197,7 @@ Route104_EventScript_BrendanEncounter:: @ 81ECE6F closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival applymovement 34, Route104_Movement_RivalWalkSlowLeft msgbox Route104_Text_BrendanHowsYourPokedex, MSGBOX_DEFAULT closemessage @@ -358,13 +358,13 @@ Route104_EventScript_Girl2:: @ 81ED090 Route104_EventScript_SailToDewford:: @ 81ED099 setobjectpriority 8, MAP_ROUTE104, 0 - setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0 + setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_BrineyBoardBoat waitmovement 0 removeobject 8 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBoardBoat + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBoardBoat waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 call Common_EventScript_PlayBrineysBoatMusic goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordNoCall goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordDadCalls @@ -372,13 +372,13 @@ Route104_EventScript_SailToDewford:: @ 81ED099 Route104_EventScript_SailToDewfordNoCall:: @ 81ED0D9 applymovement 7, Route104_Movement_SailToDewford - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewford + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewford waitmovement 0 goto Route104_EventScript_ArriveInDewford Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF applymovement 7, Route104_Movement_SailToDewfordBeforeDadCalls - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls waitmovement 0 pokenavcall Route104_Text_DadPokenavCall waitmessage @@ -389,7 +389,7 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF closemessage delay 30 setflag FLAG_ENABLE_NORMAN_MATCH_CALL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls applymovement 7, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104 waitmovement 7, MAP_ROUTE104 waitmovement 0 @@ -397,11 +397,11 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF Route104_EventScript_ArriveInDewford:: @ 81ED139 delay 50 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerExitBoat + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerExitBoat waitmovement 0 call Common_EventScript_StopBrineysBoatMusic - showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerMoveForBriney + showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerMoveForBriney waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 @@ -415,7 +415,7 @@ Route104_EventScript_ArriveInDewford:: @ 81ED139 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 copyvar VAR_BRINEY_LOCATION, VAR_0x8008 - resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN copyobjectxytoperm 2 setvar VAR_BOARD_BRINEY_BOAT_STATE, 0 diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index d536139884..0963336e59 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index d6e827500b..e3b954dd71 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 0, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 11, "y": 6, "elevation": 4, diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index d30b6102f7..ab51fcb461 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 19, "y": 60, "elevation": 1, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 27, "y": 36, "elevation": 1, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 8, "y": 45, "elevation": 1, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 19, "y": 9, "elevation": 1, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 73, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_ITEM_ROUTE_105_IRON" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 17, "y": 48, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 4, "y": 54, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 58, "elevation": 3, diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 86f32abd94..bc036ac000 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 18, "y": 5, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 29, "y": 10, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 51, "y": 14, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 65, "y": 14, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 14, "elevation": 3, diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index d163019cca..9f18d74a8d 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 41, "y": 10, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 23, "y": 11, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 16, "y": 7, "elevation": 1, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 50, "y": 11, "elevation": 1, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 33, "y": 4, "elevation": 1, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 32, "y": 4, "elevation": 1, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 50, "y": 5, "elevation": 1, diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index 253ff6ba45..66e231a4cb 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 52, "y": 13, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 35, "y": 12, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 13, "y": 13, "elevation": 1, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 8, "y": 7, "elevation": 1, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 41, "y": 5, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 43, "y": 5, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 4, "elevation": 3, diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index b5eb3499f3..12faafa211 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 21, "y": 26, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 21, "y": 24, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 12, "y": 36, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 25, "y": 39, "elevation": 1, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 15, "y": 17, "elevation": 4, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 24, "y": 13, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 19, "y": 10, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 22, "y": 7, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 11, "y": 6, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 46, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "FLAG_ITEM_ROUTE_109_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 29, "y": 32, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 28, "y": 31, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 21, "y": 56, "elevation": 0, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 24, "y": 18, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 25, "y": 18, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 30, "y": 32, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 8, "y": 41, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 9, "y": 41, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 33, "y": 6, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 32, "y": 6, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 17, "y": 13, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 27, "y": 7, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 6, "elevation": 3, @@ -325,7 +325,7 @@ "flag": "FLAG_ITEM_ROUTE_109_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 17, "y": 56, "elevation": 3, diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index e7080ac503..6de9d3c55a 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -4,7 +4,7 @@ Route109_MapScripts:: @ 81EE75F Route109_EventScript_StartDepartForDewford:: @ 81EE760 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_ROUTE109, 0 - setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0 + setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_BrineyEnterBoat waitmovement 0 removeobject 2 @@ -15,33 +15,33 @@ Route109_EventScript_StartDepartForDewford:: @ 81EE760 end Route109_EventScript_EnterBoatSouth:: @ 81EE7A5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth waitmovement 0 goto Route109_EventScript_DoSailToDewford end Route109_EventScript_EnterBoatEast:: @ 81EE7B5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast waitmovement 0 goto Route109_EventScript_DoSailToDewford end Route109_EventScript_EnterBoatWest:: @ 81EE7C5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest waitmovement 0 goto Route109_EventScript_DoSailToDewford end Route109_EventScript_DoSailToDewford:: @ 81EE7D5 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 call Common_EventScript_PlayBrineysBoatMusic applymovement 1, Route109_Movement_SailToDewford - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_SailToDewford + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_SailToDewford waitmovement 0 delay 50 call Common_EventScript_StopBrineysBoatMusic - showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerExitBoat + showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerExitBoat waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN @@ -56,7 +56,7 @@ Route109_EventScript_DoSailToDewford:: @ 81EE7D5 msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 - resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN copyobjectxytoperm 2 release diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index 4367a40b19..1816463aa0 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 6, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 14, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 660f24cccf..48cf4946e8 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 17, "y": 90, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 29, "y": 79, "elevation": 4, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 14, "y": 69, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 9, "y": 57, "elevation": 4, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 10, "y": 11, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 27, "y": 24, "elevation": 4, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 15, "y": 7, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 16, "y": 73, "elevation": 4, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 19, "y": 31, "elevation": 4, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 30, "y": 31, "elevation": 4, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 16, "y": 55, "elevation": 4, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 3, "y": 39, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 15, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 34, "y": 40, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 10, "y": 19, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 5, "y": 11, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 6, "y": 11, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 7, "y": 11, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 69, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 47, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 27, "y": 92, "elevation": 3, @@ -304,7 +304,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 7, "y": 83, "elevation": 3, @@ -317,7 +317,7 @@ "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 8, "y": 83, "elevation": 3, @@ -330,7 +330,7 @@ "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 9, "y": 83, "elevation": 3, @@ -343,7 +343,7 @@ "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 10, "y": 83, "elevation": 3, @@ -356,7 +356,7 @@ "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 8, "y": 82, "elevation": 3, @@ -369,7 +369,7 @@ "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 21, "y": 78, "elevation": 4, @@ -382,7 +382,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 34, "y": 54, "elevation": 3, @@ -395,7 +395,7 @@ "flag": "FLAG_HIDE_ROUTE_110_RIVAL_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 34, "y": 54, "elevation": 3, @@ -408,7 +408,7 @@ "flag": "FLAG_HIDE_ROUTE_110_RIVAL_2" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 69, "elevation": 3, @@ -421,7 +421,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 10, "y": 76, "elevation": 3, @@ -434,7 +434,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 7, "y": 76, "elevation": 3, @@ -447,7 +447,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 10, "y": 39, "elevation": 3, @@ -460,7 +460,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 36, "y": 40, "elevation": 3, @@ -473,7 +473,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 38, "elevation": 3, @@ -486,7 +486,7 @@ "flag": "FLAG_ITEM_ROUTE_110_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 9, "y": 79, "elevation": 3, diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index 3414f97f90..a0b616ddc8 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index ba5dfd9f07..17ecd2be3b 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -21,7 +21,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck:: @ 826EA84 Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike:: @ 826EA9F msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 6e41c77042..8a10822bd7 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 4f839d72b8..1799f0f5f3 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -39,7 +39,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike:: @ 826EBF6 Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike:: @ 826EBFC msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 6bf0d79858..859a3f1438 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 91d70160f3..c4645a46ab 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -241,11 +241,11 @@ Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041 applymovement 1, Route110_TrickHouseEnd_Movement_TrickMasterSurprise waitmovement 0 playse SE_W153 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom + applymovement OBJ_EVENT_ID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom waitmovement 0 delay 4 turnobject 1, DIR_EAST diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 346efc3aae..9c2ed8771f 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 0de4153cca..8557a19dac 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -142,7 +142,7 @@ Route110_TrickHouseEntrance_EventScript_TrickMasterFound:: @ 8269C15 addobject 1 showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, DIR_EAST - turnobject EVENT_OBJ_ID_PLAYER, DIR_WEST + turnobject OBJ_EVENT_ID_PLAYER, DIR_WEST end Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot:: @ 8269C26 @@ -245,9 +245,9 @@ Route110_TrickHouseEntrance_EventScript_TrickMaster:: @ 8269D3B Route110_TrickHouseEntrance_EventScript_FoundTrickMaster:: @ 8269D6E playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 compare VAR_TRICK_HOUSE_LEVEL, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk @@ -513,9 +513,9 @@ Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom:: @ 826A126 setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0 special DrawWholeMapView delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_EnterRoom + applymovement OBJ_EVENT_ID_PLAYER, Route110_TrickHouseEntrance_Movement_EnterRoom waitmovement 0 switch VAR_TRICK_HOUSE_LEVEL case 0, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1 diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index 586e0b6be8..b4401fb649 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 14, "y": 20, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 2, "y": 15, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 11, "y": 16, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 13, "y": 18, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 14, "y": 14, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 11, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 8, "y": 10, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 11, "y": 12, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 2, "y": 4, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 13, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 0, "y": 6, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 4, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 4, "y": 8, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 2, "y": 12, "elevation": 3, diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index 0701407b14..12564c2243 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 13, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 10, "y": 17, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 11, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 17, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 13, "elevation": 3, diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 7cb2ee7a4f..eda856ebfe 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 7, "y": 19, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 4, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 10, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 2, "y": 21, "elevation": 3, diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index e781e6d1ca..c9184d01ca 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 2, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 14, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 14, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 3, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 16, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 6, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 7, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 3, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 12, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 14, "y": 2, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 15, "elevation": 3, diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index 0b2b24282e..143c42b9cd 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 6, "y": 17, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 0, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 14, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 14, "y": 19, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 10, "y": 4, "elevation": 3, diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index bc17c15514..ce8877c4ac 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 7, "y": 9, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 11, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 4, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 21, "elevation": 3, diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index d0bcf043f6..1c7d37c316 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 9, "y": 20, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 2, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 8, "y": 17, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 12, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 9, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 13, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 12, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 4, "y": 17, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 4, "y": 6, "elevation": 0, diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index fbc4751c9d..5870077212 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 1, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 17, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index f267fe332f..3e3cbd2c0c 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 13, "y": 114, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 13, "y": 113, "elevation": 0, @@ -57,7 +57,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 13, "y": 113, "elevation": 0, @@ -70,7 +70,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 13, "y": 113, "elevation": 0, @@ -83,7 +83,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 28, "y": 51, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 22, "y": 5, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 23, "y": 5, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 8, "y": 91, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 29, "y": 37, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 27, "y": 69, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 21, "y": 47, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 32, "y": 66, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 18, "y": 101, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 19, "y": 100, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 23, "y": 8, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 104, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "FLAG_ITEM_ROUTE_111_TM_37" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 5, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 19, "y": 5, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -304,7 +304,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -317,7 +317,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -330,7 +330,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -343,7 +343,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 54, "elevation": 3, @@ -356,7 +356,7 @@ "flag": "FLAG_ITEM_ROUTE_111_STARDUST" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 114, "elevation": 3, @@ -369,7 +369,7 @@ "flag": "FLAG_ITEM_ROUTE_111_HP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 22, "y": 21, "elevation": 3, @@ -382,7 +382,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 82, "elevation": 3, @@ -395,7 +395,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 71, "elevation": 3, @@ -408,7 +408,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 32, "y": 29, "elevation": 3, @@ -421,7 +421,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 11, "y": 11, "elevation": 3, @@ -434,7 +434,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 9, "y": 27, "elevation": 3, @@ -447,7 +447,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 13, "y": 20, "elevation": 3, @@ -460,7 +460,7 @@ "flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 20, "y": 114, "elevation": 3, @@ -473,7 +473,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 26, "y": 132, "elevation": 3, @@ -486,7 +486,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 20, "y": 132, "elevation": 3, @@ -499,7 +499,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 19, "y": 121, "elevation": 3, @@ -512,7 +512,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 16, "y": 119, "elevation": 3, @@ -525,7 +525,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 29, "y": 77, "elevation": 3, @@ -538,7 +538,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 77, "elevation": 3, @@ -551,7 +551,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 37, "y": 77, "elevation": 3, @@ -564,7 +564,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 118, "elevation": 3, @@ -577,7 +577,7 @@ "flag": "FLAG_ITEM_ROUTE_111_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 14, "y": 56, "elevation": 3, @@ -590,7 +590,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 20, "y": 53, "elevation": 3, @@ -603,7 +603,7 @@ "flag": "FLAG_HIDE_ROUTE_111_DESERT_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 19, "y": 53, "elevation": 3, @@ -616,7 +616,7 @@ "flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 101, "elevation": 3, diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index b80ef6b842..2db95f0cea 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -61,11 +61,11 @@ Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2 return Route111_EventScript_SetFallingPlayerGfxMale:: @ 81F0DDA - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return Route111_EventScript_SetFallingPlayerGfxFemale:: @ 81F0DE0 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return Route111_EventScript_CheckSetSandstorm:: @ 81F0DE6 @@ -108,7 +108,7 @@ Route111_OnWarp: @ 81F0E46 .2byte 0 Route111_EventScript_HidePlayerForMirageTower:: @ 81F0E50 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN end Route111_OnFrame: @ 81F0E56 @@ -124,10 +124,10 @@ Route111_EventScript_MirageTowerDisappear:: @ 81F0E60 addobject 45 special StartPlayerDescendMirageTower waitstate - showobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN + showobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN removeobject 45 delay 16 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH delay 16 special StartMirageTowerDisintegration waitstate @@ -225,22 +225,22 @@ Route111_EventScript_PreventRouteAccess:: @ 81F0F45 end Route111_EventScript_PushUpFromRoute:: @ 81F0F7C - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushUpFromRoute + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushUpFromRoute waitmovement 0 return Route111_EventScript_PushDownFromRoute:: @ 81F0F87 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushDownFromRoute + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushDownFromRoute waitmovement 0 return Route111_EventScript_PushLeftFromRoute:: @ 81F0F92 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushLeftFromRoute + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushLeftFromRoute waitmovement 0 return Route111_EventScript_PushRightFromRoute:: @ 81F0F9D - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushRightFromRoute + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushRightFromRoute waitmovement 0 return @@ -296,7 +296,7 @@ Route111_EventScript_BattleWinstrates:: @ 81F0FE7 waitmovement 0 removeobject 1 call Route111_EventScript_CloseWinstrateDoor - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 call Route111_EventScript_OpenWinstrateDoor addobject 2 @@ -314,7 +314,7 @@ Route111_EventScript_BattleWinstrates:: @ 81F0FE7 waitmovement 0 removeobject 2 call Route111_EventScript_CloseWinstrateDoor - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 call Route111_EventScript_OpenWinstrateDoor addobject 3 @@ -332,7 +332,7 @@ Route111_EventScript_BattleWinstrates:: @ 81F0FE7 waitmovement 0 removeobject 3 call Route111_EventScript_CloseWinstrateDoor - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 call Route111_EventScript_OpenWinstrateDoor addobject 4 diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index 5c389d3976..dc305fbaa7 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index 59ac356857..fccf0eed4d 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index ef6306c159..b711e1b789 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 26, "y": 30, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 24, "y": 34, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 29, "y": 49, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 46, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 15, "y": 40, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 27, "y": 30, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 27, "y": 6, "elevation": 0, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 28, "y": 6, "elevation": 0, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 29, "y": 6, "elevation": 0, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 30, "y": 6, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 8, "y": 50, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 43, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "FLAG_ITEM_ROUTE_112_NUGGET" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 31, "y": 7, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 31, "y": 11, "elevation": 3, diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 5bd9a10f9b..50dd8ba415 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CAR", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 0b0ad3dc9b..63b33f264c 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -20,7 +20,7 @@ Route112_CableCarStation_OnFrame: @ 822AAE9 Route112_CableCarStation_EventScript_ExitCableCar:: @ 822AAF3 lockall - applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_ExitCableCar + applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_ExitCableCar applymovement 1, Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 @@ -43,7 +43,7 @@ Route112_CableCarStation_EventScript_RideCableCar:: @ 822AB38 msgbox Route112_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT closemessage applymovement 1, Route112_CableCarStation_Movement_LeadPlayerToCableCar - applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar + applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar waitmovement 0 setvar VAR_0x8004, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index a7cf388ca9..cc1c1cd356 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 66, "y": 12, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 36, "y": 10, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 62, "y": 8, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 21, "y": 11, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 51, "y": 11, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 53, "y": 7, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 79, "y": 5, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 29, "y": 6, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 71, "y": 2, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 45, "y": 6, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 46, "y": 6, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 15, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 75, "y": 3, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 71, "y": 4, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 7, "y": 6, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 13, "elevation": 3, diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 008dee0cc7..bd7bb4828c 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index ea330f94e5..4e79def6d0 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 43, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 44, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 15, "y": 65, "elevation": 7, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 30, "y": 72, "elevation": 5, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 22, "y": 50, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 19, "y": 35, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 20, "y": 56, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 45, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 37, "elevation": 4, @@ -156,7 +156,7 @@ "flag": "FLAG_ITEM_ROUTE_114_PROTEIN" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 12, "y": 43, "elevation": 4, @@ -169,7 +169,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 19, "y": 11, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 19, "y": 12, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 27, "y": 42, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 25, "y": 6, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 19, "y": 26, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 30, "y": 58, "elevation": 5, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 29, "y": 53, "elevation": 5, @@ -260,7 +260,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 30, "y": 54, "elevation": 5, @@ -273,7 +273,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 22, "y": 69, "elevation": 7, @@ -286,7 +286,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 64, "elevation": 5, @@ -299,7 +299,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 24, "y": 44, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 23, "y": 44, "elevation": 3, @@ -325,7 +325,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 28, "y": 20, "elevation": 3, @@ -338,7 +338,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 26, "y": 72, "elevation": 5, @@ -351,7 +351,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 19, "elevation": 3, @@ -364,7 +364,7 @@ "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 28, "y": 16, "elevation": 3, diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index ee0d08dd95..df373a686d 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index df360541fa..6993dc9112 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 3bea9a501f..7483b453f4 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -24,7 +24,7 @@ Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn:: @ 822AF66 lockall applymovement 1, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_NotSafeThatWay, MSGBOX_DEFAULT setvar VAR_FOSSIL_MANIAC_STATE, 2 diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index 8fd9dcaa9d..e51ec9c45e 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 2f0616c5e6..48d8f2b22a 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 18, "y": 68, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 15, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 27, "y": 53, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 5, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 13, "y": 5, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 5, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 15, "y": 50, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 19, "y": 15, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 24, "y": 62, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 60, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 7, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "FLAG_ITEM_ROUTE_115_TM_01" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 29, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "FLAG_ITEM_ROUTE_115_IRON" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 64, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 65, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 29, "y": 50, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 56, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 10, "y": 15, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 11, "y": 12, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 15, "y": 7, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 7, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 28, "y": 62, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 67, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "FLAG_ITEM_ROUTE_115_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 14, "elevation": 3, diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index d6ee64b4d6..1888cc9f61 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 2, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 19, "y": 2, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 12, "y": 7, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 21, "y": 6, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 32, "y": 10, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 13, "y": 17, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 6, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "FLAG_ITEM_ROUTE_116_ETHER" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 17, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "FLAG_ITEM_ROUTE_116_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 20, "y": 2, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 21, "y": 2, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 46, "y": 9, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 28, "y": 11, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 17, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 24, "y": 9, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 80, "y": 8, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "FLAG_ITEM_ROUTE_116_HP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 26, "y": 6, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 22, "y": 16, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 28, "y": 8, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 46, "y": 11, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 55, "y": 12, "elevation": 4, @@ -286,7 +286,7 @@ "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 38, "y": 9, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 74, "y": 13, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 33, "y": 8, "elevation": 3, @@ -325,7 +325,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 33, "y": 5, "elevation": 3, @@ -338,7 +338,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 34, "y": 7, "elevation": 0, @@ -351,7 +351,7 @@ "flag": "FLAG_ITEM_ROUTE_116_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 30, "y": 5, "elevation": 3, @@ -364,7 +364,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 36, "y": 13, "elevation": 3, @@ -377,7 +377,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 42, "y": 13, "elevation": 3, diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 1b69b312a5..91b731b441 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -152,7 +152,7 @@ Route116_EventScript_Briney:: @ 81F2D84 Route116_EventScript_BrineyTrigger:: @ 81F2D95 lockall applymovement 11, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index 2af75c05ec..fc24704dc9 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 3, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 49337c76ec..390e7e9e58 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 13, "y": 13, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 25, "y": 5, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 47, "y": 4, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 33, "y": 3, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 39, "y": 4, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 42, "y": 2, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 49, "y": 2, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 38, "y": 16, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 10, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 33, "y": 11, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 41, "y": 13, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 42, "y": 13, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 43, "y": 13, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 15, "y": 2, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 1, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "FLAG_ITEM_ROUTE_117_REVIVE" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 26, "y": 13, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 17, "y": 12, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 43, "y": 6, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 42, "y": 6, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 48, "y": 10, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 15, "y": 4, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 21, "y": 4, "elevation": 3, @@ -325,7 +325,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 16, "y": 4, "elevation": 3, diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 57fe13f319..7fb5ce2072 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 6d5e413057..790348a62a 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 5, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 5, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 37, "y": 5, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 64, "y": 10, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 12, "y": 10, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 38, "y": 8, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 28, "y": 8, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 12, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 14, "y": 14, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 56, "y": 7, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 39, "y": 15, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 17, "y": 11, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 44, "y": 7, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "FLAG_HIDE_ROUTE_118_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 69, "y": 7, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 7, "elevation": 3, diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 7b2326b13e..17895430f7 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -69,7 +69,7 @@ Route118_EventScript_RouteSign119:: @ 81F3E85 Route118_EventScript_StevenTrigger0:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_StevenApproachLedge0 waitmovement 0 @@ -79,7 +79,7 @@ Route118_EventScript_StevenTrigger0:: @ 81F3E8E Route118_EventScript_StevenTrigger1:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 goto Route118_EventScript_StevenTrigger end @@ -87,7 +87,7 @@ Route118_EventScript_StevenTrigger1:: @ 81F3EAE Route118_EventScript_StevenTrigger2:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_StevenApproachLedge2 waitmovement 0 @@ -113,19 +113,19 @@ Route118_EventScript_StevenTrigger:: @ 81F3EE4 end Route118_EventScript_StevenExit0:: @ 81F3F28 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit applymovement 19, Route118_Movement_StevenExit0 waitmovement 0 return Route118_EventScript_StevenExit1:: @ 81F3F3A - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit applymovement 19, Route118_Movement_StevenExit1 waitmovement 0 return Route118_EventScript_StevenExit2:: @ 81F3F4C - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit applymovement 19, Route118_Movement_StevenExit2 waitmovement 0 return diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index e90d5984be..34fb6e700d 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 5, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 25, "y": 5, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 26, "y": 5, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 123, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 26, "y": 123, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 125, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 7, "y": 74, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 28, "y": 116, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 35, "y": 83, "elevation": 4, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 34, "y": 122, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 17, "y": 128, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 28, "y": 14, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 19, "y": 49, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 10, "y": 50, "elevation": 4, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 8, "y": 63, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 25, "y": 32, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "FLAG_HIDE_ROUTE_119_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 121, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 96, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "FLAG_ITEM_ROUTE_119_ZINC" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 53, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 76, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 18, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 117, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 13, "y": 33, "elevation": 4, @@ -325,7 +325,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 13, "y": 34, "elevation": 4, @@ -338,7 +338,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 17, "y": 33, "elevation": 4, @@ -351,7 +351,7 @@ "flag": "FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 31, "y": 109, "elevation": 3, @@ -364,7 +364,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 8, "y": 23, "elevation": 3, @@ -377,7 +377,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 9, "y": 23, "elevation": 3, @@ -390,7 +390,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 29, "y": 90, "elevation": 3, @@ -403,7 +403,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 30, "y": 90, "elevation": 3, @@ -416,7 +416,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 19, "y": 133, "elevation": 3, @@ -429,7 +429,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 56, "elevation": 3, @@ -442,7 +442,7 @@ "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 35, "y": 93, "elevation": 4, @@ -455,7 +455,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 29, "y": 6, "elevation": 3, @@ -468,7 +468,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 31, "y": 6, "elevation": 3, @@ -481,7 +481,7 @@ "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 25, "y": 15, "elevation": 3, @@ -494,7 +494,7 @@ "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 13, "y": 104, "elevation": 3, @@ -507,7 +507,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 68, "elevation": 3, @@ -520,7 +520,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 16, "y": 52, "elevation": 3, @@ -533,7 +533,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 32, "y": 15, "elevation": 3, @@ -546,7 +546,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 5, "elevation": 4, @@ -559,7 +559,7 @@ "flag": "FLAG_ITEM_ROUTE_119_NUGGET" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 42, "elevation": 3, @@ -572,7 +572,7 @@ "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 28, "y": 25, "elevation": 3, diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 36647e9313..84486b0a07 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -51,7 +51,7 @@ Route119_EventScript_RivalEncounter:: @ 81F4488 call_if_eq Route119_EventScript_RivalEnter1 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_RivalEnter2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -207,13 +207,13 @@ Route119_EventScript_RivalEnter2:: @ 81F46D1 return Route119_EventScript_RivalExit1:: @ 81F46DC - applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1 + applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1 applymovement 25, Route119_Movement_RivalExit1 waitmovement 0 return Route119_EventScript_RivalExit2:: @ 81F46EE - applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2 + applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2 applymovement 25, Route119_Movement_RivalExit2 waitmovement 0 return diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index 943d6e7819..b50c98d173 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 1, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 0, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 8, "y": 5, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 6, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index fc72d98127..570d803d2c 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 15, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 10, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 2, "y": 11, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 14, "y": 11, "elevation": 3, diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index c5b0adcc6f..fce896243f 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 15, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 10, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 4, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 0, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 1, "y": 7, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 16, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 19, "y": 6, "elevation": 3, diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index df1021530b..04318bbb25 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -50,7 +50,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 closemessage addobject 7 @ Aqua grunt applymovement 7, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly - applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay + applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy, MSGBOX_DEFAULT closemessage @@ -72,7 +72,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 removeobject 3 removeobject 8 removeobject 7 - applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition + applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition waitmovement 0 fadescreen 0 applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index a4fa1c8495..048129a1dd 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 4, "y": 79, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 5, "y": 79, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 6, "y": 79, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 7, "y": 79, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 34, "y": 24, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 24, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 24, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 9, "y": 92, "elevation": 5, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 10, "y": 92, "elevation": 5, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 92, "elevation": 5, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 5, "y": 22, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 32, "y": 14, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 27, "y": 51, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 36, "y": 45, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 19, "y": 80, "elevation": 5, @@ -221,7 +221,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 55, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "FLAG_ITEM_ROUTE_120_NUGGET" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 37, "y": 5, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 36, "y": 5, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 36, "y": 5, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 37, "y": 5, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 35, "y": 32, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 89, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 92, "elevation": 5, @@ -325,7 +325,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 31, "y": 37, "elevation": 3, @@ -338,7 +338,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 9, "y": 60, "elevation": 3, @@ -351,7 +351,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 16, "y": 6, "elevation": 3, @@ -364,7 +364,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 18, "y": 34, "elevation": 3, @@ -377,7 +377,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 13, "elevation": 3, @@ -390,7 +390,7 @@ "flag": "FLAG_ITEM_ROUTE_120_NEST_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 82, "elevation": 5, @@ -403,7 +403,7 @@ "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 12, "y": 16, "elevation": 4, @@ -416,7 +416,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 13, "y": 15, "elevation": 4, @@ -429,7 +429,7 @@ "flag": "FLAG_HIDE_ROUTE_120_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 20, "y": 1, "elevation": 3, @@ -442,7 +442,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 15, "y": 1, "elevation": 3, @@ -455,7 +455,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 10, "y": 72, "elevation": 3, @@ -468,7 +468,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 19, "y": 28, "elevation": 3, @@ -481,7 +481,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_2", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_2", "x": 12, "y": 16, "elevation": 3, @@ -494,7 +494,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 20, "y": 11, "elevation": 3, @@ -507,7 +507,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 27, "y": 2, "elevation": 3, @@ -520,7 +520,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 4, "y": 77, "elevation": 3, @@ -533,7 +533,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 7, "y": 51, "elevation": 3, @@ -546,7 +546,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 19, "y": 48, "elevation": 3, @@ -559,7 +559,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 19, "y": 32, "elevation": 3, @@ -572,7 +572,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 14, "y": 34, "elevation": 3, @@ -585,7 +585,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 33, "elevation": 3, diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index f4ef4da872..986f631621 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -234,7 +234,7 @@ Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C Route120_EventScript_StevenGiveDeconScope:: @ 81F572C applymovement 31, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route120_Text_StevenGiveDevonScope, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE @@ -258,12 +258,12 @@ Route120_EventScript_StevenGiveDeconScope:: @ 81F572C end Route120_EventScript_PlayerApproachKecleonNorth:: @ 81F57A3 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return Route120_EventScript_PlayerApproachKecleonWest:: @ 81F57AE - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_ApproachKecleonWest + applymovement OBJ_EVENT_ID_PLAYER, Route120_Movement_ApproachKecleonWest waitmovement 0 return diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index dfe86e324a..b9febf9e45 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 29, "y": 14, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 2, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 2, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 16, "y": 2, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 2, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 64, "y": 14, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 65, "y": 14, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 66, "y": 14, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 67, "y": 14, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 39, "y": 9, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 9, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 30, "y": 8, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 30, "y": 7, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 31, "y": 7, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 32, "y": 5, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 65, "y": 4, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 63, "y": 5, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 55, "y": 8, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 11, "y": 11, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 22, "y": 5, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 55, "y": 10, "elevation": 3, @@ -304,7 +304,7 @@ "flag": "FLAG_ITEM_ROUTE_121_CARBOS" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 26, "y": 12, "elevation": 3, @@ -317,7 +317,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 11, "y": 6, "elevation": 3, @@ -330,7 +330,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 59, "y": 8, "elevation": 3, @@ -343,7 +343,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 59, "y": 13, "elevation": 3, @@ -356,7 +356,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 65, "y": 9, "elevation": 3, @@ -369,7 +369,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 72, "y": 9, "elevation": 3, @@ -382,7 +382,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 60, "y": 10, "elevation": 3, @@ -395,7 +395,7 @@ "flag": "FLAG_ITEM_ROUTE_121_REVIVE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 38, "y": 13, "elevation": 3, diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index d5aa0a0f02..2365dae6c3 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 17, "y": 9, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 6da6396be2..b1b1ad3e99 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -8,7 +8,7 @@ Route121_SafariZoneEntrance_OnFrame: @ 822BBC1 Route121_SafariZoneEntrance_EventScript_ExitSafariZone:: @ 822BBCB lockall - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_ExitSafariZone + applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_ExitSafariZone waitmovement 0 setvar VAR_SAFARI_ZONE_STATE, 0 releaseall @@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_FirstTimeInfo:: @ 822BC0E Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger:: @ 822BC18 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay, MSGBOX_YESNO @@ -75,7 +75,7 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48 msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT closemessage hidemoneybox - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone + applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone waitmovement 0 special EnterSafariMode setvar VAR_SAFARI_ZONE_STATE, 2 @@ -111,7 +111,7 @@ Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8 Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06 closemessage hidemoneybox - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter + applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter waitmovement 0 releaseall end diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index 14e69a690e..d0ae2b2428 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 3, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 3, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 3, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 3, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 81, "y": 1, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 82, "y": 1, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 83, "y": 1, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 70, "y": 12, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 58, "y": 7, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 5, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 5, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 5, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 5, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 3, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 3, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 5, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 5, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 101, "y": 13, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 129, "y": 14, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 92, "y": 9, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 8, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "FLAG_ITEM_ROUTE_123_CALCIUM" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 108, "y": 13, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 109, "y": 13, "elevation": 3, @@ -325,7 +325,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 110, "y": 13, "elevation": 3, @@ -338,7 +338,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 111, "y": 13, "elevation": 3, @@ -351,7 +351,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 18, "y": 9, "elevation": 3, @@ -364,7 +364,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 38, "y": 13, "elevation": 3, @@ -377,7 +377,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 37, "y": 13, "elevation": 3, @@ -390,7 +390,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 138, "y": 12, "elevation": 3, @@ -403,7 +403,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 49, "y": 16, "elevation": 3, @@ -416,7 +416,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 87, "y": 12, "elevation": 3, @@ -429,7 +429,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 18, "elevation": 3, @@ -442,7 +442,7 @@ "flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 75, "y": 9, "elevation": 3, @@ -455,7 +455,7 @@ "flag": "FLAG_ITEM_ROUTE_123_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 138, "y": 14, "elevation": 3, @@ -468,7 +468,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 138, "y": 16, "elevation": 3, @@ -481,7 +481,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 87, "y": 17, "elevation": 3, @@ -494,7 +494,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 66, "y": 16, "elevation": 3, @@ -507,7 +507,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 66, "y": 19, "elevation": 3, @@ -520,7 +520,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 49, "y": 19, "elevation": 3, @@ -533,7 +533,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 43, "y": 15, "elevation": 3, @@ -546,7 +546,7 @@ "flag": "FLAG_ITEM_ROUTE_123_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 14, "y": 16, "elevation": 3, @@ -559,7 +559,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 12, "elevation": 3, @@ -572,7 +572,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 57, "y": 16, "elevation": 3, diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 181bccd37d..58e2d33b27 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 4788b30fe9..abefc1639b 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -41,7 +41,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 34, "y": 25, "elevation": 1, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 61, "y": 74, "elevation": 1, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 49, "y": 45, "elevation": 1, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 7, "y": 23, "elevation": 1, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 58, "y": 58, "elevation": 1, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 12, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 53, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 58, "y": 11, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 18, "y": 44, "elevation": 1, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 17, "y": 44, "elevation": 1, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 29, "elevation": 1, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 69, "y": 74, "elevation": 1, diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index 6c0da86611..6e2288b335 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 5, "y": 4, "elevation": 0, diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 7e7f6f414d..9ef86eb8e5 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 31, "elevation": 1, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 45, "y": 9, "elevation": 1, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 38, "y": 24, "elevation": 1, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 30, "y": 28, "elevation": 1, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 21, "y": 30, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 17, "y": 19, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 18, "y": 19, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 43, "y": 19, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 48, "y": 19, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 46, "y": 17, "elevation": 3, diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 1a435accc9..ddb00439ed 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 51, "y": 65, "elevation": 1, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 56, "y": 22, "elevation": 1, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 63, "y": 43, "elevation": 1, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 48, "elevation": 1, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 15, "y": 66, "elevation": 1, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 66, "elevation": 1, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 64, "y": 5, "elevation": 1, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 56, "y": 5, "elevation": 1, diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index bde39b5a1e..1afc922ccc 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -36,7 +36,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 45, "y": 42, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 18, "y": 68, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 6, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_ITEM_ROUTE_127_ZINC" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 64, "y": 39, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_ITEM_ROUTE_127_CARBOS" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 42, "y": 21, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 64, "y": 19, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 54, "y": 14, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 15, "y": 23, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 63, "y": 63, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 12, "y": 23, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 20, "elevation": 3, diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index d9f7577025..b5f84e9a86 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -36,7 +36,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 35, "y": 33, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 78, "y": 24, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 40, "y": 22, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_HIDE_ROUTE_128_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 37, "y": 22, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_HIDE_ROUTE_128_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 38, "y": 21, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_HIDE_ROUTE_128_MAXIE" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 63, "y": 28, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 47, "y": 9, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 24, "y": 8, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 101, "y": 29, "elevation": 1, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 101, "y": 22, "elevation": 1, diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 16b1294fcf..1c8dbf6d82 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -30,12 +30,12 @@ Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_MaxieApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_MaxieResposibilityFallsToArchieAndMe, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_ArchieRunLeft - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Route128_Movement_MaxieWalkLeft waitmovement 0 msgbox Route128_Text_MaxieThisDefiesBelief, MSGBOX_DEFAULT @@ -53,12 +53,12 @@ Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_StevenApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox Route128_Text_StevenWhatIsHappening, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_StevenWalkUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_StevenWholeWorldWillDrown, MSGBOX_DEFAULT applymovement 3, Common_Movement_WalkInPlaceFastestDown diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index d43893ef77..ac47e19187 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 28, "y": 16, "elevation": 1, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 10, "y": 14, "elevation": 1, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 13, "y": 22, "elevation": 1, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 35, "y": 9, "elevation": 1, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 13, "y": 27, "elevation": 1, diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 2b1cdc347c..7a29521a38 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 70, "y": 21, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 7, "y": 21, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 52, "y": 9, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 30, "elevation": 1, diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index 5b7ad0cb0a..e70aee2bcf 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 41, "y": 32, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 18, "y": 19, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 10, "y": 22, "elevation": 1, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 31, "y": 25, "elevation": 1, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 16, "elevation": 1, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 8, "y": 16, "elevation": 1, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 52, "y": 20, "elevation": 1, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 52, "y": 27, "elevation": 1, diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 912d91f163..c42ff83a34 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 40, "y": 13, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 10, "y": 6, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 11, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 9, "y": 15, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 49, "y": 28, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 33, "y": 26, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 33, "y": 31, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 21, "y": 30, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 21, "y": 25, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 27, "elevation": 3, diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index 58b88682cd..a2b4ed493b 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 68, "y": 27, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 13, "y": 3, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 68, "y": 28, "elevation": 1, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 53, "y": 12, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 10, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 14, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 37, "y": 15, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 56, "y": 11, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 56, "y": 15, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 48, "y": 28, "elevation": 3, diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 588681ccbe..58537a53c4 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 49, "y": 9, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 58, "y": 7, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 41, "y": 23, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 24, "y": 23, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 49, "y": 16, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 43, "y": 23, "elevation": 1, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 24, "y": 30, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 50, "y": 16, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 63, "y": 14, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 50, "y": 17, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "FLAG_ITEM_ROUTE_134_CARBOS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 27, "elevation": 3, diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 9c0d41709c..a4dfa5b2dc 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 22, "y": 34, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 13, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 25, "y": 37, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 21, "y": 46, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 45, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 26, "y": 23, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 24, "y": 51, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 25, "y": 51, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 30, "y": 10, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 13, "y": 21, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_DEVON_EMPLOYEE", "x": 13, "y": 34, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 51, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 19, "y": 27, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 16, "y": 50, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 11, "y": 15, "elevation": 0, @@ -226,7 +226,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 31, "y": 36, "elevation": 3, diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 04c7ea5057..58c87bc05b 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -34,7 +34,7 @@ RustboroCity_OnFrame: @ 81E070B RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715 lockall setvar VAR_ROUTE104_STATE, 1 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown waitmovement 0 playse SE_KAIDAN delay 10 @@ -46,7 +46,7 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715 waitmovement 0 applymovement 15, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 15, RustboroCity_Movement_ScientistWalkInPlaceDown waitmovement 0 @@ -353,7 +353,7 @@ RustboroCity_EventScript_EmployeeApproachDown:: @ 81E0A6E RustboroCity_EventScript_EmployeeApproachPlayerFar:: @ 81E0A79 applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerFar waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -523,7 +523,7 @@ RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 81E0B6F waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -535,7 +535,7 @@ RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 81E0B9B waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceRight waitmovement 0 return @@ -547,7 +547,7 @@ RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 81E0BC7 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -561,7 +561,7 @@ RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 81E0BF3 waitmovement 0 applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -631,7 +631,7 @@ RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 81E0CDC waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -643,7 +643,7 @@ RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 81E0D08 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceLeft waitmovement 0 return @@ -655,7 +655,7 @@ RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 81E0D34 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -669,7 +669,7 @@ RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 81E0D60 waitmovement 0 applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -718,7 +718,7 @@ RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -734,7 +734,7 @@ RustboroCity_EventScript_RivalTrigger1:: @ 81E0E33 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -750,7 +750,7 @@ RustboroCity_EventScript_RivalTrigger2:: @ 81E0E73 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -766,7 +766,7 @@ RustboroCity_EventScript_RivalTrigger3:: @ 81E0EB3 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -782,7 +782,7 @@ RustboroCity_EventScript_RivalTrigger4:: @ 81E0EF3 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer4 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -798,7 +798,7 @@ RustboroCity_EventScript_RivalTrigger5:: @ 81E0F33 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -814,7 +814,7 @@ RustboroCity_EventScript_RivalTrigger6:: @ 81E0F73 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer6 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -830,7 +830,7 @@ RustboroCity_EventScript_RivalTrigger7:: @ 81E0FB3 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer7 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index e0e3c74498..dc7f1df54a 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 7, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 2, "elevation": 3, diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 698b4c2efa..e790910fb2 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_DEVON_EMPLOYEE", "x": 2, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_DEVON_EMPLOYEE", "x": 15, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 3bb61b6dd2..46079c612b 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 14, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 14, "y": 5, "elevation": 3, diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 3a6fdaa51d..aacaaaa9cc 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 17, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 15, "y": 5, "elevation": 3, diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 143ff45430..c85310fc6a 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_OnWarp: @ 8212455 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast:: @ 821245F - turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST + turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST end RustboroCity_DevonCorp_3F_OnFrame: @ 8212464 @@ -39,13 +39,13 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E closemessage playbgm MUS_TSURETEK, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_PleaseGoAhead, MSGBOX_DEFAULT closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT giveitem_std ITEM_LETTER diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index 3949fddb0a..d2a90e13cf 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 9, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 12, "y": 4, "elevation": 3, diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 51897b8fe8..1f07981216 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 4, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 9, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY_DOLL", + "graphics_id": "OBJ_EVENT_GFX_SKITTY_DOLL", "x": 9, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TREECKO_DOLL", + "graphics_id": "OBJ_EVENT_GFX_TREECKO_DOLL", "x": 10, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TORCHIC_DOLL", + "graphics_id": "OBJ_EVENT_GFX_TORCHIC_DOLL", "x": 10, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 8, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MUDKIP_DOLL", + "graphics_id": "OBJ_EVENT_GFX_MUDKIP_DOLL", "x": 8, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU_DOLL", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU_DOLL", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index d755db2c94..b52cf5e154 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 11, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index ac3423dc87..356e121484 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 11, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index c24eaa04ee..58a8753776 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_DEVON_EMPLOYEE", "x": 7, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 12, "y": 2, "elevation": 3, diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 74d9bdb1d8..ae6d660518 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ROXANNE", + "graphics_id": "OBJ_EVENT_GFX_ROXANNE", "x": 5, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 5, "y": 13, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 18, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index d36b51345a..230ba1ec27 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 6, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 9, "y": 2, "elevation": 3, diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 652e83bce8..8aef39d6c9 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 0f076e0676..80203105bc 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 4, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index 328ad2bc77..a6d9af5287 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 2, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 8, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index e7dec7aef8..8b2aa25683 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 11, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 3, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 6, "elevation": 3, diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index f94ad13983..3ce00d2e5f 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index bcc6729c7e..7f383a7db3 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 8, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 9, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 3, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 3, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 3, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 0, "y": 10, "elevation": 0, diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index aa5d20e1d3..05fdafe644 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 23, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 24, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 1, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 4, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 14, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 14, "y": 4, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 24, "y": 4, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 32, "y": 13, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 25, "y": 4, "elevation": 3, diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 9219ba3e4d..30ff08c363 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -85,13 +85,13 @@ RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE end RusturfTunnel_EventScript_BoyfriendApproachWanda1:: @ 822CF5D - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1 + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1 applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda1 waitmovement 0 return RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 applymovement 10, Common_Movement_WalkInPlaceFastestDown @@ -99,7 +99,7 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F return RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 applymovement 10, Common_Movement_WalkInPlaceFastestDown @@ -109,7 +109,7 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B RusturfTunnel_EventScript_FaceWandasBoyfriend1:: @ 822CFA7 applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -134,7 +134,7 @@ RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @ 822CFD4 return RusturfTunnel_EventScript_WandaAndBoyfriendExit:: @ 822CFE6 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit applymovement 10, RusturfTunnel_Movement_WandaExit applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit waitmovement 0 @@ -319,7 +319,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2 msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt applymovement 6, RusturfTunnel_Movement_GruntEscape waitmovement 0 removeobject 6 @@ -327,7 +327,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2 addobject 5 applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko2 waitmovement 0 msgbox RusturfTunnel_Text_PeekoGladToSeeYouSafe, MSGBOX_DEFAULT @@ -340,7 +340,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2 waitbuttonpress waitmoncry closemessage - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit applymovement 5, RusturfTunnel_Movement_BrineyExit applymovement 7, RusturfTunnel_Movement_PeekoExit waitmovement 0 diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index d7ed34d33b..9cad6a32e8 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 1, "y": 11, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 16, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 9, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 7, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 9, "y": 10, "elevation": 3, diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 6b88b7ae19..731b31f1f7 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -201,11 +201,11 @@ SSTidalCorridor_EventScript_ScottScene:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_ScottApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SSTidalCorridor_Text_ScottBattleFrontierInvite, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit + applymovement OBJ_EVENT_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit applymovement 1, SSTidalCorridor_Movement_SailorMoveForScott applymovement 5, SSTidalCorridor_Movement_ScottExit waitmovement 0 diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index c15757ae22..12268a861a 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 10, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index ecc45d7aa4..3f7ac0f563 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 4, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 34, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 21, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 14, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 4, "y": 14, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 22, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 15, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 28, "y": 5, "elevation": 3, diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index b35b2b74f2..6ba1538d05 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 22, "y": 9, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 6, "y": 29, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 25, "y": 10, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 25, "y": 13, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 28, "y": 14, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 23, "y": 6, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 7, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 27, "y": 7, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 3, diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index f74add57a3..7df896e9ea 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 8, "y": 20, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 30, "y": 22, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 11, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 13, "y": 35, "elevation": 0, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 8, "y": 13, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 9, "y": 7, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 8, "y": 10, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 12, "y": 8, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 17, "elevation": 3, diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 792b5ea032..de5d7cbe14 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 8, "y": 8, "elevation": 5, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 7, "elevation": 3, diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index 8babd7e8a5..50f860eca1 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 8, "y": 4, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index 9c4a791c71..3ff301da6b 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 32, "y": 34, "elevation": 4, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 26, "y": 28, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 16, "y": 6, "elevation": 5, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 15, "y": 31, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 36, "y": 16, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 36, "y": 17, "elevation": 3, diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index ed37034491..7918a9b969 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -9,7 +9,7 @@ SafariZone_South_OnFrame: @ 823D284 SafariZone_South_EventScript_EnterSafariZone:: @ 823D28E lockall - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerEnter + applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerEnter waitmovement 0 applymovement 1, SafariZone_South_Movement_ExitAttendantBlockDoor waitmovement 0 @@ -76,7 +76,7 @@ SafariZone_South_EventScript_ExitEarly:: @ 823D31A SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F applymovement 1, SafariZone_South_Movement_MoveExitAttendantNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth + applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth waitmovement 0 goto SafariZone_South_EventScript_Exit end @@ -84,7 +84,7 @@ SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F SafariZone_South_EventScript_ExitEarlyEast:: @ 823D359 applymovement 1, SafariZone_South_Movement_MoveExitAttendantEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast + applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast waitmovement 0 goto SafariZone_South_EventScript_Exit end diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index 6aabd774da..9cbc9544f6 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 7, "y": 7, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 20, "y": 30, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 8, "y": 26, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 15, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 12, "y": 16, "elevation": 3, diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 314a60412f..3fc2890251 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 22, "y": 9, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 37, "elevation": 3, diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 8df5d77fcb..c59022fd2f 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index efa3d036f7..6754e0b24a 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 10, "y": 2, "elevation": 3, diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 9eeb712564..674834269e 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 11, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 5, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 8, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 15, "y": 10, "elevation": 3, diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index 972b8c1cea..d2bd710c97 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 4, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 8, "y": 7, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 9, "y": 3, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index f97b702d08..60584d452f 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 7, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 9, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 951533e79c..310d5d0aa6 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 5, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 5, "y": 12, "elevation": 3, diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index 6902bf8541..b8aae3ad52 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 11, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 13, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 13, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 8, "elevation": 3, diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index e28b49e35a..737b2d4381 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 5, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 4, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 4, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 4, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 811b055106..10904a4e05 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1", + "graphics_id": "OBJ_EVENT_GFX_KYOGRE_1", "x": 17, "y": 38, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 9, "y": 42, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 9, "y": 42, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 8, "y": 41, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 8, "y": 42, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26" }, { - "graphics_id": "EVENT_OBJ_GFX_KYOGRE_2", + "graphics_id": "OBJ_EVENT_GFX_KYOGRE_2", "x": 17, "y": 38, "elevation": 3, diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 43c503682d..4786c7f1c1 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -7,15 +7,15 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 setvar VAR_0x8005, 3 @ Maxie setvar VAR_0x8006, 4 @ Magma grunt 1 setvar VAR_0x8007, 5 @ Magma grunt 2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 + applymovement OBJ_EVENT_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 waitmovement 0 playbgm MUS_AQA_0, 0 msgbox SeafloorCavern_Room9_Text_ArchieHoldItRightThere, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieApproachPlayer waitmovement 0 @@ -45,7 +45,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 playse SE_TAMA special DoOrbEffect applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 removeobject 7 @ sleeping Kyogre @@ -79,7 +79,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_ArchieAMessageFromOutside, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index c7fdf2e26c..c9acb1165c 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 4, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index e3b2f7b201..5f68519cb9 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 2, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 5882ffbc1a..6139d2ccf5 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 6f8db58791..56bf17c4f8 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 3c9b0f87c0..787a0727c9 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index a8405f6b93..9901de1368 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 11, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index ce2db65994..0d0fead22e 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index c2c7d55f93..182adcb298 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 2, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index ed55a18959..943495040c 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index ba4e6b3d5a..fd1fc6d6c3 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index a23b9a08ce..5ec00b4382 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 12, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index aef7939742..eebddf75de 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index f2b8879b66..b476f4b9c6 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 928f88b2df..fd7235b00c 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 13, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index a6f7071a1b..b3d0a72e6d 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 4c673cea6b..cd50b84ce2 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 0aab640d6b..f37b0c5e90 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index dd296177ce..14fc7658e6 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index fdef0a4090..24951d8643 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index df7b2f2e27..1c35f92491 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 10, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index ae17a6c6a2..10f137141c 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index d3a7945ef6..7653c04431 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index 4f168d90af..d0e2dd6584 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 7, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 01c1f85a46..868a638a17 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 9, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index b505d51cac..0d434e2981 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 18, "y": 15, "elevation": 3, diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index 419ae4ea03..9bd02803c5 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 21, "elevation": 4, diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index e5a91af3d1..7ea708ed91 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 14, "elevation": 5, diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 032e9075a5..43b88c8cc3 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 25, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 4, "elevation": 3, diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 251b7dc448..98093ccda0 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 12, "elevation": 3, diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 02a7b769e3..59f58f9b56 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 13, "y": 7, "elevation": 3, diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index dfb1ffdb02..9a6e730853 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_WallaceApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox SkyPillar_Outside_Text_OpenedDoorToSkyPillar, MSGBOX_DEFAULT closemessage @@ -50,7 +50,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304 delay 40 msgbox SkyPillar_Outside_Text_EarthquakeNotMomentToWaste, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_PlayerClimbSkyPillar + applymovement OBJ_EVENT_ID_PLAYER, SkyPillar_Outside_Movement_PlayerClimbSkyPillar applymovement 1, SkyPillar_Outside_Movement_WallaceClimbSkyPillar waitmovement 0 setvar VAR_0x8004, 1 @ vertical pan diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 6cb13c7b24..cc8d7e4b2a 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2", + "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_2", "x": 14, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2" }, { - "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_1", + "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_1", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index e12919082e..ecca9e5f69 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -94,10 +94,10 @@ SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785 SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A lockall fadeoutbgm 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_CameraPanUp + applymovement OBJ_EVENT_ID_CAMERA, SkyPillar_Top_Movement_CameraPanUp waitmovement 0 special RemoveCameraObject applymovement 1, SkyPillar_Top_Movement_RayquazaStir @@ -127,7 +127,7 @@ SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A delay 20 fadeinbgm 1 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_CameraPanDown + applymovement OBJ_EVENT_ID_CAMERA, SkyPillar_Top_Movement_CameraPanDown waitmovement 0 special RemoveCameraObject setvar VAR_SOOTOPOLIS_CITY_STATE, 5 diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 509d221094..51c6321960 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 21, "y": 11, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 34, "y": 29, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 5, "y": 13, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 26, "y": 29, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 31, "y": 27, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 5, "y": 43, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 20, "y": 37, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 42, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 29, "y": 13, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 28, "y": 14, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 28, "y": 13, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 37, "y": 41, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 28, "y": 46, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 9, "y": 50, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 16, "y": 46, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 24, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 15, "y": 31, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 30, "y": 27, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 29, "y": 27, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 6, "y": 38, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 5, "y": 51, "elevation": 3, @@ -304,7 +304,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 34, "y": 51, "elevation": 3, @@ -317,7 +317,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 47, "elevation": 3, @@ -330,7 +330,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 11, "y": 47, "elevation": 3, @@ -343,7 +343,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 5, "y": 47, "elevation": 3, @@ -356,7 +356,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 22, "y": 27, "elevation": 3, @@ -369,7 +369,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 23, "y": 27, "elevation": 3, @@ -382,7 +382,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 24, "y": 27, "elevation": 3, @@ -395,7 +395,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 21, "y": 26, "elevation": 3, @@ -408,7 +408,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 20, "y": 26, "elevation": 3, @@ -421,7 +421,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 26, "y": 27, "elevation": 3, @@ -434,7 +434,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 28, "y": 27, "elevation": 3, @@ -447,7 +447,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 25, "y": 27, "elevation": 3, @@ -460,7 +460,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 11, "y": 37, "elevation": 3, @@ -473,7 +473,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 10, "y": 12, "elevation": 0, diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 9f951e83d3..50fd39f8f4 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -56,7 +56,7 @@ SlateportCity_OnFrame: @ 81DCD12 SlateportCity_EventScript_ScottScene:: @ 81DCD1C lockall addobject 35 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott applymovement 35, SlateportCity_Movement_ScottApproachPlayer waitmovement 0 msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT @@ -572,7 +572,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8 waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_SternWatchGabbyAndTyExit - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern applymovement 10, SlateportCity_Movement_GabbyExit applymovement 9, SlateportCity_Movement_TyExit waitmovement 0 @@ -604,7 +604,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8 msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage applymovement 11, SlateportCity_Movement_SternEnterHarbor - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor waitmovement 0 removeobject 11 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN @@ -888,19 +888,19 @@ SlateportCity_EventScript_NotEnoughBerryPowder:: @ 81DD5CE SlateportCity_EventScript_ScottBattleTentScene:: @ 81DD5DC lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 opendoor 10, 12 waitdooranim addobject 35 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PushPlayerDown + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PushPlayerDown applymovement 35, SlateportCity_Movement_ScottExitBattleTent waitmovement 0 closedoor 10, 12 waitdooranim msgbox SlateportCity_Text_TakingBattleTentChallenge, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit applymovement 35, SlateportCity_Movement_ScottExitAfterBattleTent waitmovement 0 removeobject 35 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json index 8c9b257f57..b4c0723a26 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/map.json +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 5, "y": 1, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index e5195dce2a..c95f53fd9b 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -17,11 +17,11 @@ SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 return SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A @@ -30,7 +30,7 @@ SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 setvar VAR_TEMP_1, 1 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM end diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json index 08f633adfe..b5264bd8d9 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/map.json +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index a8abf0cb6b..542e97d4fc 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -15,7 +15,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B turnobject 1, DIR_SOUTH SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B @@ -27,7 +27,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EEE setvar VAR_TEMP_0, 1 applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_209059 + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_209059 waitmovement 0 compare VAR_0x8006, 2 goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044 @@ -49,7 +49,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 opendoor 2, 1 waitdooranim applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_20905E + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_20905E waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json index 1c3482b23d..6fa2b3648d 100644 --- a/data/maps/SlateportCity_BattleTentLobby/map.json +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 1, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 1, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 8, "elevation": 3, diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 8f453c147c..182a45d5e7 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F @@ -182,12 +182,12 @@ SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9 applymovement 1, SlateportCity_BattleTentLobby_Movement_2089F8 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_2089FF + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_2089FF waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, SlateportCity_BattleTentLobby_Movement_2089FC - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_208A03 + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_208A03 waitmovement 0 closedoor 6, 1 waitdooranim diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index a7c85503f9..e177aa5242 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 4, "y": 12, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 12, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 13, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, "elevation": 1, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 7, "y": 10, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 8, "y": 10, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 7, "y": 9, "elevation": 1, diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 1abb66b579..3292d05c2c 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -42,7 +42,7 @@ SlateportCity_Harbor_EventScript_AquaEscapeTrigger2:: @ 820C9D3 SlateportCity_Harbor_EventScript_AquaEscapeTrigger3:: @ 820C9DF lockall setvar VAR_0x8008, 3 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp waitmovement 0 goto SlateportCity_Harbor_EventScript_AquaEscapeScene end @@ -51,7 +51,7 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5 applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove, MSGBOX_DEFAULT closemessage @@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5 SlateportCity_Harbor_EventScript_SternApproachPlayer0:: @ 820CA89 applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return SlateportCity_Harbor_EventScript_SternApproachPlayer1:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return SlateportCity_Harbor_EventScript_SternApproachPlayer:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -237,7 +237,7 @@ SlateportCity_Harbor_EventScript_BoardFerry:: @ 820CBE9 compare VAR_FACING, DIR_EAST call_if_eq SlateportCity_Harbor_EventScript_BoardFerryEast delay 30 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 call Common_EventScript_FerryDepart return @@ -248,12 +248,12 @@ SlateportCity_Harbor_EventScript_CancelDestinationSelect:: @ 820CC2D end SlateportCity_Harbor_EventScript_BoardFerryEast:: @ 820CC37 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast waitmovement 0 return SlateportCity_Harbor_EventScript_BoardFerryNorth:: @ 820CC42 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth waitmovement 0 return diff --git a/data/maps/SlateportCity_House/map.json b/data/maps/SlateportCity_House/map.json index 38093133b7..49fbaf7763 100644 --- a/data/maps/SlateportCity_House/map.json +++ b/data/maps/SlateportCity_House/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index bcd304fc55..cefd90a06f 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 4, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/SlateportCity_NameRatersHouse/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json index aa661a99a8..f9f722ea11 100644 --- a/data/maps/SlateportCity_NameRatersHouse/map.json +++ b/data/maps/SlateportCity_NameRatersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 8d026830e4..5d202f5865 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 7, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 18, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 12, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 2, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 3, "y": 4, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 14, "y": 4, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 12, "y": 7, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 8, "y": 3, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 10, "y": 2, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 17, "y": 7, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 18, "y": 8, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 9, "y": 4, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index a6e6541da7..3c6298fac6 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -7,14 +7,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant:: @ 820AD96 SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft:: @ 820AD9F lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee end SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight:: @ 820ADB0 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee end @@ -26,7 +26,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee closemessage hidemoneybox - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end @@ -49,7 +49,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18 msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT closemessage hidemoneybox - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end @@ -168,7 +168,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 820AEF8 end SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth:: @ 820AF6C - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited @@ -181,7 +181,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth:: @ 820AF83 end SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index ca94abc062..84dafc211e 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 13, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 6, "y": 1, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 1, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 1, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 12, "y": 7, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 9, "y": 6, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 1, "y": 3, "elevation": 3, diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 9facd09375..cc0a79e636 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 fadescreen 0 delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs, MSGBOX_DEFAULT setvar VAR_0x8004, ITEM_DEVON_GOODS @@ -96,7 +96,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch:: @ 820BC8C return SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts:: @ 820BC92 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -106,12 +106,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts:: @ 820BC9D return SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth:: @ 820BCA8 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest:: @ 820BCB3 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest waitmovement 0 return diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index c73748e171..61afb60867 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 10, "y": 7, "elevation": 3, diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index f617902f12..76e9e5119f 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index f0148730a8..80ec711206 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 11, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 1, "y": 5, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 11, "y": 5, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 5, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 3, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 8, "y": 3, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 10, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 11, "y": 8, "elevation": 0, diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index a71cde2aee..67cf579a8e 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 11, "elevation": 3, diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index 1fdce590f9..d348d67109 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 8, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 9, "elevation": 3, diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index b96d5c1430..8ba0f29351 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -15,7 +15,7 @@ "connections": [], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 31, "y": 18, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 47, "y": 33, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 9, "y": 43, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 51, "y": 14, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 43, "y": 26, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 4, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 20, "y": 36, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 49, "y": 34, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GROUDON_3", + "graphics_id": "OBJ_EVENT_GFX_GROUDON_3", "x": 28, "y": 44, "elevation": 0, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON" }, { - "graphics_id": "EVENT_OBJ_GFX_KYOGRE_3", + "graphics_id": "OBJ_EVENT_GFX_KYOGRE_3", "x": 34, "y": 44, "elevation": 1, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE" }, { - "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2", + "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_2", "x": 31, "y": 41, "elevation": 1, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 17, "y": 44, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 14, "y": 42, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 17, "y": 40, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 19, "y": 37, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 29, "y": 33, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 31, "y": 33, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 31, "y": 18, "elevation": 3, diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index a936929d80..5ce954eb81 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -179,11 +179,11 @@ SootopolisCity_EventScript_PlayerFaceLegendaries:: @ 81E58E5 end SootopolisCity_EventScript_PlayerFaceLegendaries1:: @ 81E58FC - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH return SootopolisCity_EventScript_PlayerFaceLegendaries2:: @ 81E5901 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH setvar VAR_SKY_PILLAR_STATE, 3 return @@ -210,7 +210,7 @@ SootopolisCity_EventScript_StartLegendariesScene:: @ 81E5926 SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946 delay 60 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter waitmovement 0 special RemoveCameraObject delay 60 @@ -269,7 +269,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946 special SpawnCameraObject applymovement 10, SootopolisCity_Movement_KyogreIdle applymovement 9, SootopolisCity_Movement_GroudonIdle - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanBackToPokeCenter + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanBackToPokeCenter waitmovement 0 special RemoveCameraObject setvar VAR_SOOTOPOLIS_CITY_STATE, 2 @@ -310,7 +310,7 @@ SootopolisCity_Movement_PanBackToPokeCenter: @ 81E5A75 SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82 delay 60 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive waitmovement 0 special RemoveCameraObject delay 60 @@ -369,7 +369,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82 special SpawnCameraObject applymovement 10, SootopolisCity_Movement_KyogreIdle applymovement 9, SootopolisCity_Movement_GroudonIdle - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanBackToDive + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanBackToDive waitmovement 0 special RemoveCameraObject setvar VAR_SOOTOPOLIS_CITY_STATE, 2 @@ -501,7 +501,7 @@ SootopolisCity_EventScript_StartRayquazaScene:: @ 81E5BFE SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E delay 60 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter waitmovement 0 special RemoveCameraObject delay 60 @@ -515,7 +515,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E waitstate playse SE_T_KAMI special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanUp + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 @@ -554,7 +554,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE delay 60 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive waitmovement 0 special RemoveCameraObject delay 60 @@ -567,8 +567,8 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE special Script_DoRayquazaScene waitstate special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanUp - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerApproachLegendaries + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerApproachLegendaries waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 @@ -972,18 +972,18 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: @ 81E61CC msgbox SootopolisCity_Text_DoesThisMakeYourFearPokemon, MSGBOX_DEFAULT closemessage applymovement 7, SootopolisCity_Movement_StevenWalkToCaveOfOrigin - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerWalkToCaveOfOrigin + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerWalkToCaveOfOrigin waitmovement 0 delay 120 applymovement 1, SootopolisCity_Movement_ExpertMoveAside waitmovement 0 applymovement 7, SootopolisCity_Movement_StevenArriveCaveEntrance - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerArriveCaveEntrance + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerArriveCaveEntrance waitmovement 0 msgbox SootopolisCity_Text_HereWereAreHelpWallace, MSGBOX_DEFAULT closemessage setflag FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin waitmovement 0 warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 waitstate @@ -991,13 +991,13 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: @ 81E61CC SootopolisCity_EventScript_StartWalkToCaveOfOriginWest:: @ 81E6243 applymovement 7, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest waitmovement 0 return SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth:: @ 81E6255 applymovement 7, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth waitmovement 0 return diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 835a5c896a..348980c332 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_JUAN", + "graphics_id": "OBJ_EVENT_GFX_JUAN", "x": 8, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 24, "elevation": 3, diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index c455092255..a6b2a4a387 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -70,7 +70,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15 SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce waitmovement 0 playse SE_RU_HYUU delay 60 diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index dc6ed875bf..d054900c91 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 17, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 19, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 11, "y": 9, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 5, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 8, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 7, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 13, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 10, "y": 13, "elevation": 3, diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index 5899e1579f..c89d6f0acf 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index 32b3114ee4..ce984afdd9 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 3, "y": 3, "elevation": 3, diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index 469f6057e5..d7e83db4a9 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 2, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index b57e243dd4..07ef5e1c19 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 5, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 33b2d154aa..d3fc711391 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 3, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index 443a916eda..3e9e1d4f8f 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 3, "elevation": 3, diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 4ce7a16765..bc29c45825 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 5, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 1, "y": 4, "elevation": 3, diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json index 207eb1a07b..1d0c3d2c2e 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 2, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index 46810b94d2..5889a6b382 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 5, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json index 065c7f6c4c..32b496a491 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 6, "y": 4, "elevation": 0, diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index beb7e2455e..fee1c07a4c 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -32,12 +32,12 @@ SootopolisCity_MysteryEventsHouse_1F_OnFrame: @ 822799D SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle:: @ 82279B7 lockall - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs waitmovement 0 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer waitmovement 0 copyobjectxytoperm 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleWonComment @@ -135,19 +135,19 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty:: @ 8227AEF SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementNorth:: @ 8227AFE applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth waitmovement 0 return SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementEast:: @ 8227B10 applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideRight - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast waitmovement 0 return SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementWest:: @ 8227B22 applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest waitmovement 0 return diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json index 82b48fa831..417491579c 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 5, "elevation": 0, diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 9699eb5e82..8ba8724655 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -13,7 +13,7 @@ SootopolisCity_MysteryEventsHouse_B1F_OnFrame: @ 8227E5E SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: @ 8227E68 lockall - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement waitmovement 0 special CopyEReaderTrainerGreeting msgbox gStringVar4, MSGBOX_DEFAULT @@ -30,7 +30,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: @ 8227 call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleLost closemessage special HealPlayerParty - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index ca7361a86a..8cd7bb4213 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 4be59d375e..f8a60dee5a 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 1aa14a8f45..7be0fe2d08 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 23, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 13, "y": 25, "elevation": 1, diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 17ff25fdb5..e47cbc8f13 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -31,12 +31,12 @@ SouthernIsland_Exterior_EventScript_AsYouLike:: @ 8242A17 end Ferry_EventScript_DepartIslandSouth:: @ 8242A21 - applymovement EVENT_OBJ_ID_PLAYER, Ferry_EventScript_DepartIslandBoardSouth + applymovement OBJ_EVENT_ID_PLAYER, Ferry_EventScript_DepartIslandBoardSouth waitmovement 0 return Ferry_EventScript_DepartIslandWest:: @ 8242A2C - applymovement EVENT_OBJ_ID_PLAYER, Ferry_EventScript_DepartIslandBoardWest + applymovement OBJ_EVENT_ID_PLAYER, Ferry_EventScript_DepartIslandBoardWest waitmovement 0 return diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index d571473486..1fe53d8076 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 13, "y": 12, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 2, "elevation": 0, diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 7a2a04771c..78f468dbef 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -23,12 +23,12 @@ SouthernIsland_Interior_OnTransition: @ 8242A6E end SouthernIsland_Interior_EventScript_SetUpLatios:: @ 8242A8A - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIOS setvar VAR_TEMP_4, SPECIES_LATIOS return SouthernIsland_Interior_EventScript_SetUpLatias:: @ 8242A95 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIAS setvar VAR_TEMP_4, SPECIES_LATIAS return @@ -41,11 +41,11 @@ SouthernIsland_Interior_EventScript_SetUpPlayerGfx:: @ 8242AA0 end SouthernIsland_Interior_EventScript_SetBrendanGfx:: @ 8242AB8 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return SouthernIsland_Interior_EventScript_SetMayGfx:: @ 8242ABE - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return SouthernIsland_Interior_EventScript_TryLatiEncounter:: @ 8242AC4 @@ -62,7 +62,7 @@ SouthernIsland_Interior_EventScript_Lati:: @ 8242AD0 setflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS setflag FLAG_TEMP_2 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanUp + applymovement OBJ_EVENT_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanUp waitmovement 0 delay 50 waitse @@ -71,7 +71,7 @@ SouthernIsland_Interior_EventScript_Lati:: @ 8242AD0 waitmoncry addobject 2 delay 30 - applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanDown + applymovement OBJ_EVENT_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanDown applymovement 2, SouthernIsland_Interior_Movement_LatiApproach waitmovement 0 delay 50 diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index f32c4167eb..40a1006b6b 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GROUDON_1", + "graphics_id": "OBJ_EVENT_GFX_GROUDON_1", "x": 17, "y": 22, "elevation": 1, diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 2a7d912f19..61f186298a 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -25,7 +25,7 @@ TerraCave_End_EventScript_ShowGroudon:: @ 823B0E3 TerraCave_End_EventScript_Groudon:: @ 823B0EC lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, TerraCave_End_Movement_GroudonApproach waitmovement 0 diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 1919d40a52..f77f7e8ee1 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index 9e06784a0f..4bad782197 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 6, "elevation": 3, diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index 498f7a3c07..c31056ad36 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -10,7 +10,7 @@ TrainerHill_Elevator_EventScript_Attendant:: @ 826935F end TrainerHill_Elevator_EventScript_ExitToRoof:: @ 8269360 - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof waitmovement 0 releaseall warp MAP_TRAINER_HILL_ROOF, 255, 15, 5 @@ -18,7 +18,7 @@ TrainerHill_Elevator_EventScript_ExitToRoof:: @ 8269360 end TrainerHill_Elevator_EventScript_EnterElevator:: @ 8269375 - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant waitmovement 0 applymovement 1, TrainerHill_Elevator_Movement_AttendantFacePlayer waitmovement 0 @@ -29,11 +29,11 @@ TrainerHill_Elevator_EventScript_EnterElevator:: @ 8269375 releaseall applymovement 1, TrainerHill_Elevator_Movement_AttendantFaceDown waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator waitmovement 0 call TrainerHill_Elevator_EventScript_MoveElevator delay 25 - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevator + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevator waitmovement 0 warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8 waitstate diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index adbc129821..a7fe36b20d 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 11, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 4, "y": 9, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 14, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 5, "y": 14, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 14, "y": 15, "elevation": 3, diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 909aaaf9ff..714c72674d 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -23,8 +23,8 @@ TrainerHill_Entrance_OnResume: @ 82680D0 special CallTrainerHillFunction compare VAR_RESULT, 0 @ VAR_RESULT always 0 here goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant - setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6 - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant + setobjectxy OBJ_EVENT_ID_PLAYER, 9, 6 + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant end TrainerHill_Entrance_EventScript_TryFaceAttendant:: @ 82680FF @@ -32,7 +32,7 @@ TrainerHill_Entrance_EventScript_TryFaceAttendant:: @ 82680FF special CallTrainerHillFunction compare VAR_RESULT, TRUE goto_if_eq TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant end TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant:: @ 826811A @@ -63,7 +63,7 @@ TrainerHill_Entrance_OnFrame: @ 826813E TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160 lockall - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator waitmovement 0 setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1 special DrawWholeMapView @@ -84,17 +84,17 @@ TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182 TrainerHill_Entrance_EventScript_ExitChallengeLost:: @ 82681B5 lockall - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant msgbox TrainerHill_Entrance_Text_TooBadTremendousEffort, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_PlayerExitChallenge TrainerHill_Entrance_EventScript_ExitChallengeECard:: @ 82681CA lockall - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant msgbox TrainerHill_Entrance_Text_MovedReceptionHereForSwitch, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_PlayerExitChallenge:: @ 82681DA closemessage - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter waitmovement 0 setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 special HealPlayerParty @@ -128,7 +128,7 @@ TrainerHill_Entrance_EventScript_AttendantEnd:: @ 8268227 TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229 lockall - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_Closed msgbox TrainerHill_Entrance_Text_WelcomeToTrainerHill, MSGBOX_DEFAULT setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_GAME_SAVED @@ -181,7 +181,7 @@ TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314 setvar VAR_TEMP_5, 0 msgbox TrainerHill_Entrance_Text_PleaseVisitUsAgain, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end @@ -207,7 +207,7 @@ TrainerHill_Entrance_EventScript_SaveFailed:: @ 826835C TrainerHill_Entrance_EventScript_Closed:: @ 826836A msgbox TrainerHill_Entrance_Text_StillGettingReady, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json index d6db93dc1e..716f35d9dc 100644 --- a/data/maps/TrainerHill_Roof/map.json +++ b/data/maps/TrainerHill_Roof/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 7, "elevation": 3, diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index b25b7a1348..5cfb3c79b2 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 5, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 6, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 914fe500f4..ca22832677 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_UNION_ROOM_NURSE", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_NURSE", "x": 3, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 1, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 7, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, "y": 4, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 7, "y": 4, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 13, "y": 4, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 6, "elevation": 3, diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 7bdc25c322..b6c5af9f1e 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 4, "y": 17, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 9, "y": 2, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 7, "y": 11, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 7, "y": 6, "elevation": 3, diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json index b9f9493f84..4737004ed7 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 2, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 1, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 2, "y": 4, "elevation": 0, diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index e7d7d2fb4f..ee3269ca87 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -17,13 +17,13 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 return VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E @@ -157,7 +157,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 setvar VAR_TEMP_1, 1 - applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_202573 + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_202573 removeobject 2 end diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json index 88e8516357..ea26e7dda6 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/map.json +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc index 907ef3fd62..719c99d1df 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -10,12 +10,12 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A lockall setvar VAR_TEMP_0, 1 applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE - applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020DE + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020DE waitmovement 0 opendoor 2, 1 waitdooranim applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020E4 - applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020E3 + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020E3 waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json index 98026448f9..ec3dd904dd 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/map.json +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 0, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 9, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 1, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 12, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 2, "y": 8, "elevation": 3, diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 88c98fc1a3..933029bffc 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF @@ -246,12 +246,12 @@ VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41 applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A70 - applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A70 + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A70 waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A74 - applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A77 + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A77 waitmovement 0 closedoor 6, 1 waitdooranim diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 1c35ca9f51..092493624c 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index 972cb773cd..554d5012d9 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index b3be7f53bd..58832dbb27 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 8, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 59f0556b65..aa809fc1ea 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 10, "y": 6, "elevation": 3, diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index 5f0453e8b9..c8c835265f 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index c599df1e03..fd9dd90b20 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 14, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 7, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 2, "y": 4, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index e17afd483d..f11a88e8c3 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 33, "y": 22, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 15, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 27, "y": 34, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 12, "y": 25, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 26, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 39, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 31, "y": 9, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 29, "y": 17, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 32, "y": 17, "elevation": 3, diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 6536be9348..eb0d161447 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_WallyBattleTrigger2:: @ 8235DC8 end VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_WallyEntranceDefeat diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 404b3f8cc0..db92808fd0 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 20, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 21, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 20, "y": 26, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 21, "y": 25, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 19, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 4, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 18, "y": 12, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 25, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 21, "y": 26, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 34, "y": 4, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 37, "y": 12, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 26, "y": 16, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 21, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 34, "y": 3, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 8, "elevation": 4, @@ -249,7 +249,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 3, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 14, "y": 16, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 14, "y": 20, "elevation": 3, diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 0d837b617e..ed87a231cf 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 15, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 43, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 17, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 35, "y": 22, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 25, "y": 18, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 25, "y": 21, "elevation": 4, diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 2a6da1a585..a20faa14e3 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -48,8 +48,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE .2byte 0 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LINK_RECEPTIONIST + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_LINK_RECEPTIONIST setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction compare VAR_RESULT, 3 @@ -62,17 +62,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35 setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 end @@ -125,7 +125,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 @@ -133,7 +133,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 @@ -214,7 +214,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 @@ -222,7 +222,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 1b2e3f60ff..6a7ba7d7e9 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -154,7 +154,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 8276CB5 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 @@ -175,7 +175,7 @@ CableClub_EventScript_PlayerExitTradeCenter:: @ 8276CFF setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 @@ -195,7 +195,7 @@ CableClub_EventScript_ExitRecordCorner:: @ 8276D2C CableClub_EventScript_PlayerExitRecordCorner:: @ 8276D44 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_ExitRecordCornerRet @@ -218,7 +218,7 @@ CableClub_EventScript_PlayerExitUnionRoom:: @ 8276D84 setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 @@ -232,24 +232,24 @@ CableClub_EventScript_TrainerCardDataOverwritten:: @ 8276DAE delay 60 message CableClub_Text_HopeToSeeYouAgain waitmessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return CableClub_EventScript_PlayerExitLinkRoom:: @ 8276DD5 - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 return CableClub_EventScript_Tutorial:: @ 8276DE0 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox CableClub_Text_FirstTimeRightThisWay, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, CableClub_Movement_PlayerApproachCounter + applymovement OBJ_EVENT_ID_PLAYER, CableClub_Movement_PlayerApproachCounter waitmovement 0 delay 30 msgbox CableClub_Text_ExplainWirelessClubFirstTime, MSGBOX_DEFAULT @@ -377,13 +377,13 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -397,7 +397,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD @ Unused CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight waitmovement 0 return @@ -482,13 +482,13 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -557,13 +557,13 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -958,13 +958,13 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 5, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim special Script_ResetUnionRoomTrade @@ -1289,13 +1289,13 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -1485,9 +1485,9 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterMinigameRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterMinigameRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY release waitstate end diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index 7f0dd5534e..b55c932ee5 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -9,7 +9,7 @@ CaveHole_FixCrackedGround: @ 82A8331 EventScript_FallDownHole:: @ 82A8337 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible + applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -20,7 +20,7 @@ EventScript_FallDownHole:: @ 82A8337 EventScript_FallDownHoleMtPyre:: @ 82A8350 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible + applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index e7aada6988..3b395de21b 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -1,5 +1,5 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 @@ -18,7 +18,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 return PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 1b706e603b..9e9b23c047 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -13,19 +13,19 @@ PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 8292704 msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 829274D - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 8292758 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -37,7 +37,7 @@ PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 8292765 msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor waitmovement 0 releaseall end @@ -78,7 +78,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsMale:: @ 82927DF addobject VAR_0x8008 applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage @@ -91,7 +91,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F addobject VAR_0x8008 applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage @@ -152,17 +152,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale waitmovement 0 playbgm MUS_INTER_V, 0 msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale waitmovement 0 call PlayersHouse_1F_EventScript_WatchGymBroadcast - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT @@ -177,17 +177,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale waitmovement 0 playbgm MUS_INTER_V, 0 msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale waitmovement 0 call PlayersHouse_1F_EventScript_WatchGymBroadcast - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT @@ -209,7 +209,7 @@ PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: @ 829294B return PlayersHouse_1F_EventScript_WatchGymBroadcast:: @ 829296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT fadedefaultbgm @@ -549,38 +549,38 @@ PlayersHouse_1F_EventScript_MomApproachDadFemale:: @ 8292CC1 return PlayersHouse_1F_EventScript_DadExitsMale:: @ 8292CD6 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsMale waitmovement 0 return PlayersHouse_1F_EventScript_DadExitsFemale:: @ 8292CEF - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsFemale waitmovement 0 return PlayersHouse_1F_EventScript_PlayerEnterRoomMale:: @ 8292D08 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale waitmovement 0 return PlayersHouse_1F_EventScript_PlayerEnterRoomFemale:: @ 8292D13 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale waitmovement 0 return PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale:: @ 8292D1E - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale waitmovement 0 applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale waitmovement 0 applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight waitmovement 0 @@ -589,14 +589,14 @@ PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33 PlayersHouse_1F_EventScript_MomApproachPlayerMale:: @ 8292D48 applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PlayersHouse_1F_EventScript_MomApproachPlayerFemale:: @ 8292D5D applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -613,14 +613,14 @@ PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale:: @ 8292D7D PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale:: @ 8292D88 applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale:: @ 8292D9D applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/scripts/rival_graphics.inc b/data/scripts/rival_graphics.inc index 60bd1a3372..a8ead6497f 100644 --- a/data/scripts/rival_graphics.inc +++ b/data/scripts/rival_graphics.inc @@ -7,11 +7,11 @@ Common_EventScript_SetupRivalGfxId:: @ 8271ED7 end EventScript_SetupRivalGfxIdFemale:: @ 8271EEF - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return EventScript_SetupRivalGfxIdMale:: @ 8271EF5 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB @@ -23,11 +23,11 @@ Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB end EventScript_SetupRivalOnBikeGfxIdFemale:: @ 8271F13 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE return EventScript_SetupRivalOnBikeGfxIdMale:: @ 8271F19 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE return @ Unused @@ -40,9 +40,9 @@ Common_EventScript_SetupRivalGfxIdSameGender:: @ 8271F1F end EventScript_SetupRivalGfxIdMale2:: @ 8271F37 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return EventScript_SetupRivalGfxIdFemale2:: @ 8271F3D - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 617b19b42f..e92c419dcc 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -157,7 +157,7 @@ SecretBase_EventScript_InitSecretBase:: @ 8275B5B end SecretBase_EventScript_FirstEntrance:: @ 8275B81 - applymovement EVENT_OBJ_ID_PLAYER, SecretBase_Movement_275BB4 + applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_275BB4 waitmovement 0 setvar VAR_INIT_SECRET_BASE, 1 msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 07ed2d40c0..87ceb97b7c 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -1,266 +1,266 @@ -#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H -#define GUARD_CONSTANTS_EVENT_OBJECTS_H +#ifndef GUARD_CONSTANTS_OBJECT_EVENTS_H +#define GUARD_CONSTANTS_OBJECT_EVENTS_H -#define EVENT_OBJ_GFX_BRENDAN_NORMAL 0 -#define EVENT_OBJ_GFX_BRENDAN_MACH_BIKE 1 -#define EVENT_OBJ_GFX_BRENDAN_SURFING 2 -#define EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE 3 -#define EVENT_OBJ_GFX_QUINTY_PLUMP 4 -#define EVENT_OBJ_GFX_NINJA_BOY 5 -#define EVENT_OBJ_GFX_TWIN 6 -#define EVENT_OBJ_GFX_BOY_1 7 -#define EVENT_OBJ_GFX_GIRL_1 8 -#define EVENT_OBJ_GFX_BOY_2 9 -#define EVENT_OBJ_GFX_GIRL_2 10 -#define EVENT_OBJ_GFX_LITTLE_BOY 11 -#define EVENT_OBJ_GFX_LITTLE_GIRL 12 -#define EVENT_OBJ_GFX_BOY_3 13 -#define EVENT_OBJ_GFX_GIRL_3 14 -#define EVENT_OBJ_GFX_RICH_BOY 15 -#define EVENT_OBJ_GFX_WOMAN_1 16 -#define EVENT_OBJ_GFX_FAT_MAN 17 -#define EVENT_OBJ_GFX_POKEFAN_F 18 -#define EVENT_OBJ_GFX_MAN_1 19 -#define EVENT_OBJ_GFX_WOMAN_2 20 -#define EVENT_OBJ_GFX_EXPERT_M 21 -#define EVENT_OBJ_GFX_EXPERT_F 22 -#define EVENT_OBJ_GFX_MAN_2 23 -#define EVENT_OBJ_GFX_WOMAN_3 24 -#define EVENT_OBJ_GFX_POKEFAN_M 25 -#define EVENT_OBJ_GFX_WOMAN_4 26 -#define EVENT_OBJ_GFX_COOK 27 -#define EVENT_OBJ_GFX_LINK_RECEPTIONIST 28 -#define EVENT_OBJ_GFX_OLD_MAN 29 -#define EVENT_OBJ_GFX_OLD_WOMAN 30 -#define EVENT_OBJ_GFX_CAMPER 31 -#define EVENT_OBJ_GFX_PICNICKER 32 -#define EVENT_OBJ_GFX_MAN_3 33 -#define EVENT_OBJ_GFX_WOMAN_5 34 -#define EVENT_OBJ_GFX_YOUNGSTER 35 -#define EVENT_OBJ_GFX_BUG_CATCHER 36 -#define EVENT_OBJ_GFX_PSYCHIC_M 37 -#define EVENT_OBJ_GFX_SCHOOL_KID_M 38 -#define EVENT_OBJ_GFX_MANIAC 39 -#define EVENT_OBJ_GFX_HEX_MANIAC 40 -#define EVENT_OBJ_GFX_RAYQUAZA_1 41 -#define EVENT_OBJ_GFX_SWIMMER_M 42 -#define EVENT_OBJ_GFX_SWIMMER_F 43 -#define EVENT_OBJ_GFX_BLACK_BELT 44 -#define EVENT_OBJ_GFX_BEAUTY 45 -#define EVENT_OBJ_GFX_SCIENTIST_1 46 -#define EVENT_OBJ_GFX_LASS 47 -#define EVENT_OBJ_GFX_GENTLEMAN 48 -#define EVENT_OBJ_GFX_SAILOR 49 -#define EVENT_OBJ_GFX_FISHERMAN 50 -#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M 51 -#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F 52 -#define EVENT_OBJ_GFX_TUBER_F 53 -#define EVENT_OBJ_GFX_TUBER_M 54 -#define EVENT_OBJ_GFX_HIKER 55 -#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M 56 -#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F 57 -#define EVENT_OBJ_GFX_NURSE 58 -#define EVENT_OBJ_GFX_ITEM_BALL 59 -#define EVENT_OBJ_GFX_BERRY_TREE 60 -#define EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES 61 -#define EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES 62 -#define EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE 63 -#define EVENT_OBJ_GFX_PROF_BIRCH 64 -#define EVENT_OBJ_GFX_MAN_4 65 -#define EVENT_OBJ_GFX_MAN_5 66 -#define EVENT_OBJ_GFX_REPORTER_M 67 -#define EVENT_OBJ_GFX_REPORTER_F 68 -#define EVENT_OBJ_GFX_BARD 69 -#define EVENT_OBJ_GFX_ANABEL 70 -#define EVENT_OBJ_GFX_TUCKER 71 -#define EVENT_OBJ_GFX_GRETA 72 -#define EVENT_OBJ_GFX_SPENSER 73 -#define EVENT_OBJ_GFX_NOLAND 74 -#define EVENT_OBJ_GFX_LUCY 75 -#define EVENT_OBJ_GFX_UNUSED_NATU_DOLL 76 -#define EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL 77 -#define EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL 78 -#define EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL 79 -#define EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL 80 -#define EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL 81 -#define EVENT_OBJ_GFX_CUTTABLE_TREE 82 -#define EVENT_OBJ_GFX_MART_EMPLOYEE 83 -#define EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN 84 -#define EVENT_OBJ_GFX_TEALA 85 -#define EVENT_OBJ_GFX_BREAKABLE_ROCK 86 -#define EVENT_OBJ_GFX_PUSHABLE_BOULDER 87 -#define EVENT_OBJ_GFX_MR_BRINEYS_BOAT 88 -#define EVENT_OBJ_GFX_MAY_NORMAL 89 -#define EVENT_OBJ_GFX_MAY_MACH_BIKE 90 -#define EVENT_OBJ_GFX_MAY_ACRO_BIKE 91 -#define EVENT_OBJ_GFX_MAY_SURFING 92 -#define EVENT_OBJ_GFX_MAY_FIELD_MOVE 93 -#define EVENT_OBJ_GFX_TRUCK 94 -#define EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX 95 -#define EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY 96 -#define EVENT_OBJ_GFX_BIRCHS_BAG 97 -#define EVENT_OBJ_GFX_ZIGZAGOON_1 98 -#define EVENT_OBJ_GFX_ARTIST 99 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL 100 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE 101 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE 102 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING 103 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE 104 -#define EVENT_OBJ_GFX_RIVAL_MAY_NORMAL 105 -#define EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE 106 -#define EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE 107 -#define EVENT_OBJ_GFX_RIVAL_MAY_SURFING 108 -#define EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE 109 -#define EVENT_OBJ_GFX_CAMERAMAN 110 -#define EVENT_OBJ_GFX_BRENDAN_UNDERWATER 111 -#define EVENT_OBJ_GFX_MAY_UNDERWATER 112 -#define EVENT_OBJ_GFX_MOVING_BOX 113 -#define EVENT_OBJ_GFX_CABLE_CAR 114 -#define EVENT_OBJ_GFX_SCIENTIST_2 115 -#define EVENT_OBJ_GFX_DEVON_EMPLOYEE 116 -#define EVENT_OBJ_GFX_AQUA_MEMBER_M 117 -#define EVENT_OBJ_GFX_AQUA_MEMBER_F 118 -#define EVENT_OBJ_GFX_MAGMA_MEMBER_M 119 -#define EVENT_OBJ_GFX_MAGMA_MEMBER_F 120 -#define EVENT_OBJ_GFX_SIDNEY 121 -#define EVENT_OBJ_GFX_PHOEBE 122 -#define EVENT_OBJ_GFX_GLACIA 123 -#define EVENT_OBJ_GFX_DRAKE 124 -#define EVENT_OBJ_GFX_ROXANNE 125 -#define EVENT_OBJ_GFX_BRAWLY 126 -#define EVENT_OBJ_GFX_WATTSON 127 -#define EVENT_OBJ_GFX_FLANNERY 128 -#define EVENT_OBJ_GFX_NORMAN 129 -#define EVENT_OBJ_GFX_WINONA 130 -#define EVENT_OBJ_GFX_LIZA 131 -#define EVENT_OBJ_GFX_TATE 132 -#define EVENT_OBJ_GFX_WALLACE 133 -#define EVENT_OBJ_GFX_STEVEN 134 -#define EVENT_OBJ_GFX_WALLY 135 -#define EVENT_OBJ_GFX_LITTLE_BOY_3 136 -#define EVENT_OBJ_GFX_BRENDAN_FISHING 137 -#define EVENT_OBJ_GFX_MAY_FISHING 138 -#define EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN 139 -#define EVENT_OBJ_GFX_SS_TIDAL 140 -#define EVENT_OBJ_GFX_SUBMARINE_SHADOW 141 -#define EVENT_OBJ_GFX_PICHU_DOLL 142 -#define EVENT_OBJ_GFX_PIKACHU_DOLL 143 -#define EVENT_OBJ_GFX_MARILL_DOLL 144 -#define EVENT_OBJ_GFX_TOGEPI_DOLL 145 -#define EVENT_OBJ_GFX_CYNDAQUIL_DOLL 146 -#define EVENT_OBJ_GFX_CHIKORITA_DOLL 147 -#define EVENT_OBJ_GFX_TOTODILE_DOLL 148 -#define EVENT_OBJ_GFX_JIGGLYPUFF_DOLL 149 -#define EVENT_OBJ_GFX_MEOWTH_DOLL 150 -#define EVENT_OBJ_GFX_CLEFAIRY_DOLL 151 -#define EVENT_OBJ_GFX_DITTO_DOLL 152 -#define EVENT_OBJ_GFX_SMOOCHUM_DOLL 153 -#define EVENT_OBJ_GFX_TREECKO_DOLL 154 -#define EVENT_OBJ_GFX_TORCHIC_DOLL 155 -#define EVENT_OBJ_GFX_MUDKIP_DOLL 156 -#define EVENT_OBJ_GFX_DUSKULL_DOLL 157 -#define EVENT_OBJ_GFX_WYNAUT_DOLL 158 -#define EVENT_OBJ_GFX_BALTOY_DOLL 159 -#define EVENT_OBJ_GFX_KECLEON_DOLL 160 -#define EVENT_OBJ_GFX_AZURILL_DOLL 161 -#define EVENT_OBJ_GFX_SKITTY_DOLL 162 -#define EVENT_OBJ_GFX_SWABLU_DOLL 163 -#define EVENT_OBJ_GFX_GULPIN_DOLL 164 -#define EVENT_OBJ_GFX_LOTAD_DOLL 165 -#define EVENT_OBJ_GFX_SEEDOT_DOLL 166 -#define EVENT_OBJ_GFX_PIKA_CUSHION 167 -#define EVENT_OBJ_GFX_ROUND_CUSHION 168 -#define EVENT_OBJ_GFX_KISS_CUSHION 169 -#define EVENT_OBJ_GFX_ZIGZAG_CUSHION 170 -#define EVENT_OBJ_GFX_SPIN_CUSHION 171 -#define EVENT_OBJ_GFX_DIAMOND_CUSHION 172 -#define EVENT_OBJ_GFX_BALL_CUSHION 173 -#define EVENT_OBJ_GFX_GRASS_CUSHION 174 -#define EVENT_OBJ_GFX_FIRE_CUSHION 175 -#define EVENT_OBJ_GFX_WATER_CUSHION 176 -#define EVENT_OBJ_GFX_BIG_SNORLAX_DOLL 177 -#define EVENT_OBJ_GFX_BIG_RHYDON_DOLL 178 -#define EVENT_OBJ_GFX_BIG_LAPRAS_DOLL 179 -#define EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL 180 -#define EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL 181 -#define EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL 182 -#define EVENT_OBJ_GFX_BIG_WAILMER_DOLL 183 -#define EVENT_OBJ_GFX_BIG_REGIROCK_DOLL 184 -#define EVENT_OBJ_GFX_BIG_REGICE_DOLL 185 -#define EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL 186 -#define EVENT_OBJ_GFX_LATIAS 187 -#define EVENT_OBJ_GFX_LATIOS 188 -#define EVENT_OBJ_GFX_GAMEBOY_KID 189 -#define EVENT_OBJ_GFX_CONTEST_JUDGE 190 -#define EVENT_OBJ_GFX_BRENDAN_WATERING 191 -#define EVENT_OBJ_GFX_MAY_WATERING 192 -#define EVENT_OBJ_GFX_BRENDAN_DECORATING 193 -#define EVENT_OBJ_GFX_MAY_DECORATING 194 -#define EVENT_OBJ_GFX_ARCHIE 195 -#define EVENT_OBJ_GFX_MAXIE 196 -#define EVENT_OBJ_GFX_KYOGRE_1 197 -#define EVENT_OBJ_GFX_GROUDON_1 198 -#define EVENT_OBJ_GFX_FOSSIL 199 -#define EVENT_OBJ_GFX_REGIROCK 200 -#define EVENT_OBJ_GFX_REGICE 201 -#define EVENT_OBJ_GFX_REGISTEEL 202 -#define EVENT_OBJ_GFX_SKITTY 203 -#define EVENT_OBJ_GFX_KECLEON_1 204 -#define EVENT_OBJ_GFX_KYOGRE_2 205 -#define EVENT_OBJ_GFX_GROUDON_2 206 -#define EVENT_OBJ_GFX_RAYQUAZA_2 207 -#define EVENT_OBJ_GFX_ZIGZAGOON_2 208 -#define EVENT_OBJ_GFX_PIKACHU 209 -#define EVENT_OBJ_GFX_AZUMARILL 210 -#define EVENT_OBJ_GFX_WINGULL 211 -#define EVENT_OBJ_GFX_KECLEON_2 212 -#define EVENT_OBJ_GFX_TUBER_M_SWIMMING 213 -#define EVENT_OBJ_GFX_AZURILL 214 -#define EVENT_OBJ_GFX_MOM 215 -#define EVENT_OBJ_GFX_LINK_BRENDAN 216 -#define EVENT_OBJ_GFX_LINK_MAY 217 -#define EVENT_OBJ_GFX_JUAN 218 -#define EVENT_OBJ_GFX_SCOTT 219 -#define EVENT_OBJ_GFX_POOCHYENA 220 -#define EVENT_OBJ_GFX_KYOGRE_3 221 -#define EVENT_OBJ_GFX_GROUDON_3 222 -#define EVENT_OBJ_GFX_MYSTERY_GIFT_MAN 223 -#define EVENT_OBJ_GFX_TRICK_HOUSE_STATUE 224 -#define EVENT_OBJ_GFX_KIRLIA 225 -#define EVENT_OBJ_GFX_DUSCLOPS 226 -#define EVENT_OBJ_GFX_UNION_ROOM_NURSE 227 -#define EVENT_OBJ_GFX_SUDOWOODO 228 -#define EVENT_OBJ_GFX_MEW 229 -#define EVENT_OBJ_GFX_RED 230 -#define EVENT_OBJ_GFX_LEAF 231 -#define EVENT_OBJ_GFX_DEOXYS 232 -#define EVENT_OBJ_GFX_DEOXYS_TRIANGLE 233 -#define EVENT_OBJ_GFX_BRANDON 234 -#define EVENT_OBJ_GFX_LINK_RS_BRENDAN 235 -#define EVENT_OBJ_GFX_LINK_RS_MAY 236 -#define EVENT_OBJ_GFX_LUGIA 237 -#define EVENT_OBJ_GFX_HOOH 238 -#define EVENT_OBJ_GFX_BARD_2 239 +#define OBJ_EVENT_GFX_BRENDAN_NORMAL 0 +#define OBJ_EVENT_GFX_BRENDAN_MACH_BIKE 1 +#define OBJ_EVENT_GFX_BRENDAN_SURFING 2 +#define OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE 3 +#define OBJ_EVENT_GFX_QUINTY_PLUMP 4 +#define OBJ_EVENT_GFX_NINJA_BOY 5 +#define OBJ_EVENT_GFX_TWIN 6 +#define OBJ_EVENT_GFX_BOY_1 7 +#define OBJ_EVENT_GFX_GIRL_1 8 +#define OBJ_EVENT_GFX_BOY_2 9 +#define OBJ_EVENT_GFX_GIRL_2 10 +#define OBJ_EVENT_GFX_LITTLE_BOY 11 +#define OBJ_EVENT_GFX_LITTLE_GIRL 12 +#define OBJ_EVENT_GFX_BOY_3 13 +#define OBJ_EVENT_GFX_GIRL_3 14 +#define OBJ_EVENT_GFX_RICH_BOY 15 +#define OBJ_EVENT_GFX_WOMAN_1 16 +#define OBJ_EVENT_GFX_FAT_MAN 17 +#define OBJ_EVENT_GFX_POKEFAN_F 18 +#define OBJ_EVENT_GFX_MAN_1 19 +#define OBJ_EVENT_GFX_WOMAN_2 20 +#define OBJ_EVENT_GFX_EXPERT_M 21 +#define OBJ_EVENT_GFX_EXPERT_F 22 +#define OBJ_EVENT_GFX_MAN_2 23 +#define OBJ_EVENT_GFX_WOMAN_3 24 +#define OBJ_EVENT_GFX_POKEFAN_M 25 +#define OBJ_EVENT_GFX_WOMAN_4 26 +#define OBJ_EVENT_GFX_COOK 27 +#define OBJ_EVENT_GFX_LINK_RECEPTIONIST 28 +#define OBJ_EVENT_GFX_OLD_MAN 29 +#define OBJ_EVENT_GFX_OLD_WOMAN 30 +#define OBJ_EVENT_GFX_CAMPER 31 +#define OBJ_EVENT_GFX_PICNICKER 32 +#define OBJ_EVENT_GFX_MAN_3 33 +#define OBJ_EVENT_GFX_WOMAN_5 34 +#define OBJ_EVENT_GFX_YOUNGSTER 35 +#define OBJ_EVENT_GFX_BUG_CATCHER 36 +#define OBJ_EVENT_GFX_PSYCHIC_M 37 +#define OBJ_EVENT_GFX_SCHOOL_KID_M 38 +#define OBJ_EVENT_GFX_MANIAC 39 +#define OBJ_EVENT_GFX_HEX_MANIAC 40 +#define OBJ_EVENT_GFX_RAYQUAZA_1 41 +#define OBJ_EVENT_GFX_SWIMMER_M 42 +#define OBJ_EVENT_GFX_SWIMMER_F 43 +#define OBJ_EVENT_GFX_BLACK_BELT 44 +#define OBJ_EVENT_GFX_BEAUTY 45 +#define OBJ_EVENT_GFX_SCIENTIST_1 46 +#define OBJ_EVENT_GFX_LASS 47 +#define OBJ_EVENT_GFX_GENTLEMAN 48 +#define OBJ_EVENT_GFX_SAILOR 49 +#define OBJ_EVENT_GFX_FISHERMAN 50 +#define OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M 51 +#define OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F 52 +#define OBJ_EVENT_GFX_TUBER_F 53 +#define OBJ_EVENT_GFX_TUBER_M 54 +#define OBJ_EVENT_GFX_HIKER 55 +#define OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M 56 +#define OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F 57 +#define OBJ_EVENT_GFX_NURSE 58 +#define OBJ_EVENT_GFX_ITEM_BALL 59 +#define OBJ_EVENT_GFX_BERRY_TREE 60 +#define OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES 61 +#define OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES 62 +#define OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE 63 +#define OBJ_EVENT_GFX_PROF_BIRCH 64 +#define OBJ_EVENT_GFX_MAN_4 65 +#define OBJ_EVENT_GFX_MAN_5 66 +#define OBJ_EVENT_GFX_REPORTER_M 67 +#define OBJ_EVENT_GFX_REPORTER_F 68 +#define OBJ_EVENT_GFX_BARD 69 +#define OBJ_EVENT_GFX_ANABEL 70 +#define OBJ_EVENT_GFX_TUCKER 71 +#define OBJ_EVENT_GFX_GRETA 72 +#define OBJ_EVENT_GFX_SPENSER 73 +#define OBJ_EVENT_GFX_NOLAND 74 +#define OBJ_EVENT_GFX_LUCY 75 +#define OBJ_EVENT_GFX_UNUSED_NATU_DOLL 76 +#define OBJ_EVENT_GFX_UNUSED_MAGNEMITE_DOLL 77 +#define OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL 78 +#define OBJ_EVENT_GFX_UNUSED_WOOPER_DOLL 79 +#define OBJ_EVENT_GFX_UNUSED_PIKACHU_DOLL 80 +#define OBJ_EVENT_GFX_UNUSED_PORYGON2_DOLL 81 +#define OBJ_EVENT_GFX_CUTTABLE_TREE 82 +#define OBJ_EVENT_GFX_MART_EMPLOYEE 83 +#define OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN 84 +#define OBJ_EVENT_GFX_TEALA 85 +#define OBJ_EVENT_GFX_BREAKABLE_ROCK 86 +#define OBJ_EVENT_GFX_PUSHABLE_BOULDER 87 +#define OBJ_EVENT_GFX_MR_BRINEYS_BOAT 88 +#define OBJ_EVENT_GFX_MAY_NORMAL 89 +#define OBJ_EVENT_GFX_MAY_MACH_BIKE 90 +#define OBJ_EVENT_GFX_MAY_ACRO_BIKE 91 +#define OBJ_EVENT_GFX_MAY_SURFING 92 +#define OBJ_EVENT_GFX_MAY_FIELD_MOVE 93 +#define OBJ_EVENT_GFX_TRUCK 94 +#define OBJ_EVENT_GFX_VIGOROTH_CARRYING_BOX 95 +#define OBJ_EVENT_GFX_VIGOROTH_FACING_AWAY 96 +#define OBJ_EVENT_GFX_BIRCHS_BAG 97 +#define OBJ_EVENT_GFX_ZIGZAGOON_1 98 +#define OBJ_EVENT_GFX_ARTIST 99 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL 100 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE 101 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_ACRO_BIKE 102 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_SURFING 103 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE 104 +#define OBJ_EVENT_GFX_RIVAL_MAY_NORMAL 105 +#define OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE 106 +#define OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE 107 +#define OBJ_EVENT_GFX_RIVAL_MAY_SURFING 108 +#define OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE 109 +#define OBJ_EVENT_GFX_CAMERAMAN 110 +#define OBJ_EVENT_GFX_BRENDAN_UNDERWATER 111 +#define OBJ_EVENT_GFX_MAY_UNDERWATER 112 +#define OBJ_EVENT_GFX_MOVING_BOX 113 +#define OBJ_EVENT_GFX_CABLE_CAR 114 +#define OBJ_EVENT_GFX_SCIENTIST_2 115 +#define OBJ_EVENT_GFX_DEVON_EMPLOYEE 116 +#define OBJ_EVENT_GFX_AQUA_MEMBER_M 117 +#define OBJ_EVENT_GFX_AQUA_MEMBER_F 118 +#define OBJ_EVENT_GFX_MAGMA_MEMBER_M 119 +#define OBJ_EVENT_GFX_MAGMA_MEMBER_F 120 +#define OBJ_EVENT_GFX_SIDNEY 121 +#define OBJ_EVENT_GFX_PHOEBE 122 +#define OBJ_EVENT_GFX_GLACIA 123 +#define OBJ_EVENT_GFX_DRAKE 124 +#define OBJ_EVENT_GFX_ROXANNE 125 +#define OBJ_EVENT_GFX_BRAWLY 126 +#define OBJ_EVENT_GFX_WATTSON 127 +#define OBJ_EVENT_GFX_FLANNERY 128 +#define OBJ_EVENT_GFX_NORMAN 129 +#define OBJ_EVENT_GFX_WINONA 130 +#define OBJ_EVENT_GFX_LIZA 131 +#define OBJ_EVENT_GFX_TATE 132 +#define OBJ_EVENT_GFX_WALLACE 133 +#define OBJ_EVENT_GFX_STEVEN 134 +#define OBJ_EVENT_GFX_WALLY 135 +#define OBJ_EVENT_GFX_LITTLE_BOY_3 136 +#define OBJ_EVENT_GFX_BRENDAN_FISHING 137 +#define OBJ_EVENT_GFX_MAY_FISHING 138 +#define OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN 139 +#define OBJ_EVENT_GFX_SS_TIDAL 140 +#define OBJ_EVENT_GFX_SUBMARINE_SHADOW 141 +#define OBJ_EVENT_GFX_PICHU_DOLL 142 +#define OBJ_EVENT_GFX_PIKACHU_DOLL 143 +#define OBJ_EVENT_GFX_MARILL_DOLL 144 +#define OBJ_EVENT_GFX_TOGEPI_DOLL 145 +#define OBJ_EVENT_GFX_CYNDAQUIL_DOLL 146 +#define OBJ_EVENT_GFX_CHIKORITA_DOLL 147 +#define OBJ_EVENT_GFX_TOTODILE_DOLL 148 +#define OBJ_EVENT_GFX_JIGGLYPUFF_DOLL 149 +#define OBJ_EVENT_GFX_MEOWTH_DOLL 150 +#define OBJ_EVENT_GFX_CLEFAIRY_DOLL 151 +#define OBJ_EVENT_GFX_DITTO_DOLL 152 +#define OBJ_EVENT_GFX_SMOOCHUM_DOLL 153 +#define OBJ_EVENT_GFX_TREECKO_DOLL 154 +#define OBJ_EVENT_GFX_TORCHIC_DOLL 155 +#define OBJ_EVENT_GFX_MUDKIP_DOLL 156 +#define OBJ_EVENT_GFX_DUSKULL_DOLL 157 +#define OBJ_EVENT_GFX_WYNAUT_DOLL 158 +#define OBJ_EVENT_GFX_BALTOY_DOLL 159 +#define OBJ_EVENT_GFX_KECLEON_DOLL 160 +#define OBJ_EVENT_GFX_AZURILL_DOLL 161 +#define OBJ_EVENT_GFX_SKITTY_DOLL 162 +#define OBJ_EVENT_GFX_SWABLU_DOLL 163 +#define OBJ_EVENT_GFX_GULPIN_DOLL 164 +#define OBJ_EVENT_GFX_LOTAD_DOLL 165 +#define OBJ_EVENT_GFX_SEEDOT_DOLL 166 +#define OBJ_EVENT_GFX_PIKA_CUSHION 167 +#define OBJ_EVENT_GFX_ROUND_CUSHION 168 +#define OBJ_EVENT_GFX_KISS_CUSHION 169 +#define OBJ_EVENT_GFX_ZIGZAG_CUSHION 170 +#define OBJ_EVENT_GFX_SPIN_CUSHION 171 +#define OBJ_EVENT_GFX_DIAMOND_CUSHION 172 +#define OBJ_EVENT_GFX_BALL_CUSHION 173 +#define OBJ_EVENT_GFX_GRASS_CUSHION 174 +#define OBJ_EVENT_GFX_FIRE_CUSHION 175 +#define OBJ_EVENT_GFX_WATER_CUSHION 176 +#define OBJ_EVENT_GFX_BIG_SNORLAX_DOLL 177 +#define OBJ_EVENT_GFX_BIG_RHYDON_DOLL 178 +#define OBJ_EVENT_GFX_BIG_LAPRAS_DOLL 179 +#define OBJ_EVENT_GFX_BIG_VENUSAUR_DOLL 180 +#define OBJ_EVENT_GFX_BIG_CHARIZARD_DOLL 181 +#define OBJ_EVENT_GFX_BIG_BLASTOISE_DOLL 182 +#define OBJ_EVENT_GFX_BIG_WAILMER_DOLL 183 +#define OBJ_EVENT_GFX_BIG_REGIROCK_DOLL 184 +#define OBJ_EVENT_GFX_BIG_REGICE_DOLL 185 +#define OBJ_EVENT_GFX_BIG_REGISTEEL_DOLL 186 +#define OBJ_EVENT_GFX_LATIAS 187 +#define OBJ_EVENT_GFX_LATIOS 188 +#define OBJ_EVENT_GFX_GAMEBOY_KID 189 +#define OBJ_EVENT_GFX_CONTEST_JUDGE 190 +#define OBJ_EVENT_GFX_BRENDAN_WATERING 191 +#define OBJ_EVENT_GFX_MAY_WATERING 192 +#define OBJ_EVENT_GFX_BRENDAN_DECORATING 193 +#define OBJ_EVENT_GFX_MAY_DECORATING 194 +#define OBJ_EVENT_GFX_ARCHIE 195 +#define OBJ_EVENT_GFX_MAXIE 196 +#define OBJ_EVENT_GFX_KYOGRE_1 197 +#define OBJ_EVENT_GFX_GROUDON_1 198 +#define OBJ_EVENT_GFX_FOSSIL 199 +#define OBJ_EVENT_GFX_REGIROCK 200 +#define OBJ_EVENT_GFX_REGICE 201 +#define OBJ_EVENT_GFX_REGISTEEL 202 +#define OBJ_EVENT_GFX_SKITTY 203 +#define OBJ_EVENT_GFX_KECLEON_1 204 +#define OBJ_EVENT_GFX_KYOGRE_2 205 +#define OBJ_EVENT_GFX_GROUDON_2 206 +#define OBJ_EVENT_GFX_RAYQUAZA_2 207 +#define OBJ_EVENT_GFX_ZIGZAGOON_2 208 +#define OBJ_EVENT_GFX_PIKACHU 209 +#define OBJ_EVENT_GFX_AZUMARILL 210 +#define OBJ_EVENT_GFX_WINGULL 211 +#define OBJ_EVENT_GFX_KECLEON_2 212 +#define OBJ_EVENT_GFX_TUBER_M_SWIMMING 213 +#define OBJ_EVENT_GFX_AZURILL 214 +#define OBJ_EVENT_GFX_MOM 215 +#define OBJ_EVENT_GFX_LINK_BRENDAN 216 +#define OBJ_EVENT_GFX_LINK_MAY 217 +#define OBJ_EVENT_GFX_JUAN 218 +#define OBJ_EVENT_GFX_SCOTT 219 +#define OBJ_EVENT_GFX_POOCHYENA 220 +#define OBJ_EVENT_GFX_KYOGRE_3 221 +#define OBJ_EVENT_GFX_GROUDON_3 222 +#define OBJ_EVENT_GFX_MYSTERY_GIFT_MAN 223 +#define OBJ_EVENT_GFX_TRICK_HOUSE_STATUE 224 +#define OBJ_EVENT_GFX_KIRLIA 225 +#define OBJ_EVENT_GFX_DUSCLOPS 226 +#define OBJ_EVENT_GFX_UNION_ROOM_NURSE 227 +#define OBJ_EVENT_GFX_SUDOWOODO 228 +#define OBJ_EVENT_GFX_MEW 229 +#define OBJ_EVENT_GFX_RED 230 +#define OBJ_EVENT_GFX_LEAF 231 +#define OBJ_EVENT_GFX_DEOXYS 232 +#define OBJ_EVENT_GFX_DEOXYS_TRIANGLE 233 +#define OBJ_EVENT_GFX_BRANDON 234 +#define OBJ_EVENT_GFX_LINK_RS_BRENDAN 235 +#define OBJ_EVENT_GFX_LINK_RS_MAY 236 +#define OBJ_EVENT_GFX_LUGIA 237 +#define OBJ_EVENT_GFX_HOOH 238 +#define OBJ_EVENT_GFX_BARD_2 239 // These are dynamic object gfx ids. // They correspond with the values of the VAR_OBJ_GFX_ID_X vars. // More info about them in include/constants/vars.h -#define EVENT_OBJ_GFX_VAR_0 240 -#define EVENT_OBJ_GFX_VAR_1 241 -#define EVENT_OBJ_GFX_VAR_2 242 -#define EVENT_OBJ_GFX_VAR_3 243 -#define EVENT_OBJ_GFX_VAR_4 244 -#define EVENT_OBJ_GFX_VAR_5 245 -#define EVENT_OBJ_GFX_VAR_6 246 -#define EVENT_OBJ_GFX_VAR_7 247 -#define EVENT_OBJ_GFX_VAR_8 248 -#define EVENT_OBJ_GFX_VAR_9 249 -#define EVENT_OBJ_GFX_VAR_A 250 -#define EVENT_OBJ_GFX_VAR_B 251 -#define EVENT_OBJ_GFX_VAR_C 252 -#define EVENT_OBJ_GFX_VAR_D 253 -#define EVENT_OBJ_GFX_VAR_E 254 -#define EVENT_OBJ_GFX_VAR_F 255 +#define OBJ_EVENT_GFX_VAR_0 240 +#define OBJ_EVENT_GFX_VAR_1 241 +#define OBJ_EVENT_GFX_VAR_2 242 +#define OBJ_EVENT_GFX_VAR_3 243 +#define OBJ_EVENT_GFX_VAR_4 244 +#define OBJ_EVENT_GFX_VAR_5 245 +#define OBJ_EVENT_GFX_VAR_6 246 +#define OBJ_EVENT_GFX_VAR_7 247 +#define OBJ_EVENT_GFX_VAR_8 248 +#define OBJ_EVENT_GFX_VAR_9 249 +#define OBJ_EVENT_GFX_VAR_A 250 +#define OBJ_EVENT_GFX_VAR_B 251 +#define OBJ_EVENT_GFX_VAR_C 252 +#define OBJ_EVENT_GFX_VAR_D 253 +#define OBJ_EVENT_GFX_VAR_E 254 +#define OBJ_EVENT_GFX_VAR_F 255 #define SHADOW_SIZE_S 0 #define SHADOW_SIZE_M 1 @@ -274,9 +274,9 @@ #define TRACKS_FOOT 1 #define TRACKS_BIKE_TIRE 2 -#define FIRST_DECORATION_SPRITE_GFX EVENT_OBJ_GFX_PICHU_DOLL +#define FIRST_DECORATION_SPRITE_GFX OBJ_EVENT_GFX_PICHU_DOLL -#define EVENT_OBJ_ID_PLAYER 0xFF -#define EVENT_OBJ_ID_CAMERA 0x7F +#define OBJ_EVENT_ID_PLAYER 0xFF +#define OBJ_EVENT_ID_CAMERA 0x7F -#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H +#endif // GUARD_CONSTANTS_OBJECT_EVENTS_H diff --git a/include/constants/global.h b/include/constants/global.h index 4ade1c8236..46fd810cb1 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -31,7 +31,7 @@ // capacities of various saveblock objects #define DAYCARE_MON_COUNT 2 #define POKEBLOCKS_COUNT 40 -#define EVENT_OBJECTS_COUNT 16 +#define OBJECT_EVENTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 300 #define VARS_COUNT 256 @@ -45,7 +45,7 @@ #define BAG_POKEBALLS_COUNT 16 #define BAG_TMHM_COUNT 64 #define BAG_BERRIES_COUNT 46 -#define EVENT_OBJECT_TEMPLATES_COUNT 64 +#define OBJECT_EVENT_TEMPLATES_COUNT 64 #define DECOR_MAX_SECRET_BASE 16 #define DECOR_MAX_PLAYERS_HOUSE 12 diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h index f9ca40199b..8958720189 100644 --- a/include/event_obj_lock.h +++ b/include/event_obj_lock.h @@ -1,5 +1,5 @@ -#ifndef GUARD_EVENT_OBJ_LOCK_H -#define GUARD_EVENT_OBJ_LOCK_H +#ifndef GUARD_OBJ_EVENT_LOCK_H +#define GUARD_OBJ_EVENT_LOCK_H bool8 sub_80983C4(void); void ScriptFreezeObjectEvents(void); @@ -10,4 +10,4 @@ bool8 sub_8098734(void); void ScriptUnfreezeObjectEvents(void); void sub_8098524(void); -#endif // GUARD_EVENT_OBJ_LOCK_H +#endif // GUARD_OBJ_EVENT_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 956f888f90..4d40b91cb9 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -1,5 +1,5 @@ -#ifndef GUARD_FIELD_EVENT_OBJ_H -#define GUARD_FIELD_EVENT_OBJ_H +#ifndef GUARD_FIELD_OBJ_EVENT_H +#define GUARD_FIELD_OBJ_EVENT_H #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 @@ -54,7 +54,7 @@ struct PairedPalettes struct LockedAnimObjectEvents { - u8 objectEventIds[EVENT_OBJECTS_COUNT]; + u8 objectEventIds[OBJECT_EVENTS_COUNT]; u8 count; }; @@ -423,4 +423,4 @@ void sub_8097BB4(u8 var1, u8 graphicsId); void sub_8097CC4(u8 var1, u8 var2); bool32 sub_8097D9C(u8 var); -#endif //GUARD_FIELD_EVENT_OBJ_H +#endif //GUARD_FIELD_OBJ_EVENT_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 81f638c8d3..82ffc85307 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -263,7 +263,7 @@ enum COLLISION_OUTSIDE_RANGE, COLLISION_IMPASSABLE, COLLISION_ELEVATION_MISMATCH, - COLLISION_EVENT_OBJECT, + COLLISION_OBJECT_EVENT, COLLISION_STOP_SURFING, COLLISION_LEDGE_JUMP, COLLISION_PUSHED_BOULDER, @@ -320,7 +320,7 @@ struct Camera s32 y; }; -extern struct ObjectEvent gObjectEvents[EVENT_OBJECTS_COUNT]; +extern struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT]; extern u8 gSelectedObjectEvent; extern struct MapHeader gMapHeader; extern struct PlayerAvatar gPlayerAvatar; diff --git a/include/global.h b/include/global.h index 56899dc68d..8334fe62f9 100644 --- a/include/global.h +++ b/include/global.h @@ -918,8 +918,8 @@ struct SaveBlock1 /*0x9C2*/ u8 field_9C2[6]; /*0x9C8*/ u16 trainerRematchStepCounter; /*0x9CA*/ u8 trainerRematches[100]; - /*0xA30*/ struct ObjectEvent objectEvents[EVENT_OBJECTS_COUNT]; - /*0xC70*/ struct ObjectEventTemplate objectEventTemplates[EVENT_OBJECT_TEMPLATES_COUNT]; + /*0xA30*/ struct ObjectEvent objectEvents[OBJECT_EVENTS_COUNT]; + /*0xC70*/ struct ObjectEventTemplate objectEventTemplates[OBJECT_EVENT_TEMPLATES_COUNT]; /*0x1270*/ u8 flags[FLAGS_COUNT]; /*0x139C*/ u16 vars[VARS_COUNT]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS]; diff --git a/include/shop.h b/include/shop.h index 10e2b1060c..164d6f3c27 100644 --- a/include/shop.h +++ b/include/shop.h @@ -13,7 +13,7 @@ enum // shop view window NPC info enum enum { - EVENT_OBJ_ID, + OBJ_EVENT_ID, X_COORD, Y_COORD, ANIM_NUM, diff --git a/src/battle_pike.c b/src/battle_pike.c index 85a214b0f5..9b45c7b119 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -268,151 +268,151 @@ static const struct PikeWildMon *const *const sWildMons[2] = static const struct PikeRoomNPC sNPCTable[] = { { - .graphicsId = EVENT_OBJ_GFX_POKEFAN_F, + .graphicsId = OBJ_EVENT_GFX_POKEFAN_F, .speechId1 = 3, .speechId2 = 5, .speechId3 = 6 }, { - .graphicsId = EVENT_OBJ_GFX_NINJA_BOY, + .graphicsId = OBJ_EVENT_GFX_NINJA_BOY, .speechId1 = 13, .speechId2 = 32, .speechId3 = 37 }, { - .graphicsId = EVENT_OBJ_GFX_FAT_MAN, + .graphicsId = OBJ_EVENT_GFX_FAT_MAN, .speechId1 = 8, .speechId2 = 11, .speechId3 = 12 }, { - .graphicsId = EVENT_OBJ_GFX_BUG_CATCHER, + .graphicsId = OBJ_EVENT_GFX_BUG_CATCHER, .speechId1 = 34, .speechId2 = 30, .speechId3 = 33 }, { - .graphicsId = EVENT_OBJ_GFX_EXPERT_M, + .graphicsId = OBJ_EVENT_GFX_EXPERT_M, .speechId1 = 0, .speechId2 = 0, .speechId3 = 0 }, { - .graphicsId = EVENT_OBJ_GFX_OLD_WOMAN, + .graphicsId = OBJ_EVENT_GFX_OLD_WOMAN, .speechId1 = 1, .speechId2 = 1, .speechId3 = 1 }, { - .graphicsId = EVENT_OBJ_GFX_BLACK_BELT, + .graphicsId = OBJ_EVENT_GFX_BLACK_BELT, .speechId1 = 22, .speechId2 = 23, .speechId3 = 27 }, { - .graphicsId = EVENT_OBJ_GFX_HIKER, + .graphicsId = OBJ_EVENT_GFX_HIKER, .speechId1 = 8, .speechId2 = 22, .speechId3 = 31 }, { - .graphicsId = EVENT_OBJ_GFX_GIRL_3, + .graphicsId = OBJ_EVENT_GFX_GIRL_3, .speechId1 = 13, .speechId2 = 39, .speechId3 = 21 }, { - .graphicsId = EVENT_OBJ_GFX_WOMAN_2, + .graphicsId = OBJ_EVENT_GFX_WOMAN_2, .speechId1 = 2, .speechId2 = 4, .speechId3 = 17 }, { - .graphicsId = EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, + .graphicsId = OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M, .speechId1 = 30, .speechId2 = 20, .speechId3 = 36 }, { - .graphicsId = EVENT_OBJ_GFX_MAN_5, + .graphicsId = OBJ_EVENT_GFX_MAN_5, .speechId1 = 28, .speechId2 = 34, .speechId3 = 25 }, { - .graphicsId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .graphicsId = OBJ_EVENT_GFX_SCHOOL_KID_M, .speechId1 = 23, .speechId2 = 38, .speechId3 = 26 }, { - .graphicsId = EVENT_OBJ_GFX_FISHERMAN, + .graphicsId = OBJ_EVENT_GFX_FISHERMAN, .speechId1 = 23, .speechId2 = 30, .speechId3 = 11 }, { - .graphicsId = EVENT_OBJ_GFX_LASS, + .graphicsId = OBJ_EVENT_GFX_LASS, .speechId1 = 15, .speechId2 = 19, .speechId3 = 14 }, { - .graphicsId = EVENT_OBJ_GFX_MANIAC, + .graphicsId = OBJ_EVENT_GFX_MANIAC, .speechId1 = 2, .speechId2 = 29, .speechId3 = 26 }, { - .graphicsId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + .graphicsId = OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, .speechId1 = 37, .speechId2 = 12, .speechId3 = 32 }, { - .graphicsId = EVENT_OBJ_GFX_MAN_3, + .graphicsId = OBJ_EVENT_GFX_MAN_3, .speechId1 = 24, .speechId2 = 23, .speechId3 = 38 }, { - .graphicsId = EVENT_OBJ_GFX_WOMAN_3, + .graphicsId = OBJ_EVENT_GFX_WOMAN_3, .speechId1 = 5, .speechId2 = 22, .speechId3 = 4 }, { - .graphicsId = EVENT_OBJ_GFX_LITTLE_BOY, + .graphicsId = OBJ_EVENT_GFX_LITTLE_BOY, .speechId1 = 41, .speechId2 = 37, .speechId3 = 35 }, { - .graphicsId = EVENT_OBJ_GFX_TUBER_F, + .graphicsId = OBJ_EVENT_GFX_TUBER_F, .speechId1 = 39, .speechId2 = 14, .speechId3 = 13 }, { - .graphicsId = EVENT_OBJ_GFX_GENTLEMAN, + .graphicsId = OBJ_EVENT_GFX_GENTLEMAN, .speechId1 = 10, .speechId2 = 7, .speechId3 = 9 }, { - .graphicsId = EVENT_OBJ_GFX_LITTLE_GIRL, + .graphicsId = OBJ_EVENT_GFX_LITTLE_GIRL, .speechId1 = 40, .speechId2 = 20, .speechId3 = 16 }, { - .graphicsId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, + .graphicsId = OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, .speechId1 = 18, .speechId2 = 13, .speechId3 = 21 }, { - .graphicsId = EVENT_OBJ_GFX_MAN_1, + .graphicsId = OBJ_EVENT_GFX_MAN_1, .speechId1 = 22, .speechId2 = 31, .speechId3 = 27 @@ -557,8 +557,8 @@ static void SetupRoomObjectEvents(void) u32 objGfx1; u16 objGfx2; - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST); - VarSet(VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_DUSCLOPS); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_LINK_RECEPTIONIST); + VarSet(VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_DUSCLOPS); setObjGfx1 = TRUE; setObjGfx2 = FALSE; objGfx1 = 0; @@ -571,28 +571,28 @@ static void SetupRoomObjectEvents(void) setObjGfx1 = FALSE; break; case PIKE_ROOM_HEAL_FULL: - objGfx1 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + objGfx1 = OBJ_EVENT_GFX_LINK_RECEPTIONIST; break; case PIKE_ROOM_NPC: objGfx1 = (u8)(GetNPCRoomGraphicsId()); break; case PIKE_ROOM_STATUS: - objGfx1 = EVENT_OBJ_GFX_GENTLEMAN; + objGfx1 = OBJ_EVENT_GFX_GENTLEMAN; if (sStatusMon == PIKE_STATUS_DUSCLOPS) - objGfx2 = EVENT_OBJ_GFX_DUSCLOPS; + objGfx2 = OBJ_EVENT_GFX_DUSCLOPS; else - objGfx2 = EVENT_OBJ_GFX_KIRLIA; + objGfx2 = OBJ_EVENT_GFX_KIRLIA; setObjGfx2 = TRUE; break; case PIKE_ROOM_HEAL_PART: - objGfx1 = EVENT_OBJ_GFX_GENTLEMAN; + objGfx1 = OBJ_EVENT_GFX_GENTLEMAN; break; case PIKE_ROOM_WILD_MONS: setObjGfx1 = FALSE; break; case PIKE_ROOM_HARD_BATTLE: PrepareOneTrainer(TRUE); - objGfx2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + objGfx2 = OBJ_EVENT_GFX_LINK_RECEPTIONIST; setObjGfx1 = FALSE; setObjGfx2 = TRUE; break; @@ -602,7 +602,7 @@ static void SetupRoomObjectEvents(void) break; case PIKE_ROOM_BRAIN: SetFrontierBrainEventObjGfx(FRONTIER_FACILITY_PIKE); - objGfx2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + objGfx2 = OBJ_EVENT_GFX_LINK_RECEPTIONIST; setObjGfx1 = FALSE; setObjGfx2 = TRUE; break; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index b8e8dca76d..2e7c30a9ca 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1064,7 +1064,7 @@ static void ShowPostBattleHintText(void) case HINT_REMAINING_ITEMS: for (i = 0; i < GetNumBattlePyramidObjectEvents(); i++) { - if (events[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF) + if (events[i].graphicsId == OBJ_EVENT_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF) textIndex++; } i = 1; @@ -1617,9 +1617,9 @@ void LoadBattlePyramidFloorObjectEventScripts(void) int i; struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) { - if (events[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + if (events[i].graphicsId != OBJ_EVENT_GFX_ITEM_BALL) events[i].script = BattlePyramid_TrainerBattle; else events[i].script = BattlePyramid_FindItemBall; @@ -1853,9 +1853,9 @@ static bool8 TrySetPyramidObjectEventPositionAtCoords(u8 objType, u8 x, u8 y, u8 if (mapHeader->events->objectEvents[i].x != x || mapHeader->events->objectEvents[i].y != y) continue; - if (objType != OBJ_TRAINERS || mapHeader->events->objectEvents[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL) + if (objType != OBJ_TRAINERS || mapHeader->events->objectEvents[i].graphicsId == OBJ_EVENT_GFX_ITEM_BALL) { - if (objType != OBJ_ITEMS || mapHeader->events->objectEvents[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + if (objType != OBJ_ITEMS || mapHeader->events->objectEvents[i].graphicsId != OBJ_EVENT_GFX_ITEM_BALL) continue; } @@ -1872,7 +1872,7 @@ static bool8 TrySetPyramidObjectEventPositionAtCoords(u8 objType, u8 x, u8 y, u8 floorEvents[objectEventId].x += (squareId % 4) * 8; floorEvents[objectEventId].y += (squareId / 4) * 8; floorEvents[objectEventId].localId = objectEventId + 1; - if (floorEvents[objectEventId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + if (floorEvents[objectEventId].graphicsId != OBJ_EVENT_GFX_ITEM_BALL) { i = GetUniqueTrainerId(objectEventId); floorEvents[objectEventId].graphicsId = GetBattleFacilityTrainerGfxId(i); diff --git a/src/battle_tower.c b/src/battle_tower.c index e1d54f0532..1f1220e22c 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -207,60 +207,60 @@ const u8 gTowerFemaleFacilityClasses[20] = const u8 gTowerMaleTrainerGfxIds[30] = { - EVENT_OBJ_GFX_HIKER, - EVENT_OBJ_GFX_TUBER_M, - EVENT_OBJ_GFX_MAN_3, - EVENT_OBJ_GFX_RICH_BOY, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, - EVENT_OBJ_GFX_BLACK_BELT, - EVENT_OBJ_GFX_MAN_5, - EVENT_OBJ_GFX_MAN_5, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_PSYCHIC_M, - EVENT_OBJ_GFX_GENTLEMAN, - EVENT_OBJ_GFX_SCHOOL_KID_M, - EVENT_OBJ_GFX_POKEFAN_M, - EVENT_OBJ_GFX_EXPERT_M, - EVENT_OBJ_GFX_YOUNGSTER, - EVENT_OBJ_GFX_FISHERMAN, - EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, - EVENT_OBJ_GFX_MAN_3, - EVENT_OBJ_GFX_MAN_5, - EVENT_OBJ_GFX_NINJA_BOY, - EVENT_OBJ_GFX_SAILOR, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_MAN_4, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_BUG_CATCHER, - EVENT_OBJ_GFX_HIKER + OBJ_EVENT_GFX_HIKER, + OBJ_EVENT_GFX_TUBER_M, + OBJ_EVENT_GFX_MAN_3, + OBJ_EVENT_GFX_RICH_BOY, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_BLACK_BELT, + OBJ_EVENT_GFX_MAN_5, + OBJ_EVENT_GFX_MAN_5, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_PSYCHIC_M, + OBJ_EVENT_GFX_GENTLEMAN, + OBJ_EVENT_GFX_SCHOOL_KID_M, + OBJ_EVENT_GFX_POKEFAN_M, + OBJ_EVENT_GFX_EXPERT_M, + OBJ_EVENT_GFX_YOUNGSTER, + OBJ_EVENT_GFX_FISHERMAN, + OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_MAN_3, + OBJ_EVENT_GFX_MAN_5, + OBJ_EVENT_GFX_NINJA_BOY, + OBJ_EVENT_GFX_SAILOR, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_MAN_4, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_BUG_CATCHER, + OBJ_EVENT_GFX_HIKER }; const u8 gTowerFemaleTrainerGfxIds[20] = { - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_TUBER_F, - EVENT_OBJ_GFX_WOMAN_5, - EVENT_OBJ_GFX_HEX_MANIAC, - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_BEAUTY, - EVENT_OBJ_GFX_LASS, - EVENT_OBJ_GFX_GIRL_3, - EVENT_OBJ_GFX_POKEFAN_F, - EVENT_OBJ_GFX_EXPERT_F, - EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, - EVENT_OBJ_GFX_GIRL_3, - EVENT_OBJ_GFX_WOMAN_5, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_LASS + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_TUBER_F, + OBJ_EVENT_GFX_WOMAN_5, + OBJ_EVENT_GFX_HEX_MANIAC, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_BEAUTY, + OBJ_EVENT_GFX_LASS, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_POKEFAN_F, + OBJ_EVENT_GFX_EXPERT_F, + OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_WOMAN_5, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_LASS }; static const u8 sRubyFacilityClassToEmerald[][2] = @@ -1482,13 +1482,13 @@ void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId) { case 0: default: - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1); return; case 1: - VarSet(VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1); + VarSet(VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1); return; case 15: - VarSet(VAR_OBJ_GFX_ID_E, EVENT_OBJ_GFX_BOY_1); + VarSet(VAR_OBJ_GFX_ID_E, OBJ_EVENT_GFX_BOY_1); return; } } @@ -1547,7 +1547,7 @@ u8 GetBattleFacilityTrainerGfxId(u16 trainerId) } else { - return EVENT_OBJ_GFX_BOY_1; + return OBJ_EVENT_GFX_BOY_1; } } @@ -3695,7 +3695,7 @@ u8 FacilityClassToGraphicsId(u8 facilityClass) } else { - return EVENT_OBJ_GFX_BOY_1; + return OBJ_EVENT_GFX_BOY_1; } } diff --git a/src/berry.c b/src/berry.c index 4c8662e08d..438d29af98 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1326,7 +1326,7 @@ void ResetBerryTreeSparkleFlags(void) top = cam_top + 3; right = cam_left + 14; bottom = top + 8; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (gObjectEvents[i].active && gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) { diff --git a/src/bike.c b/src/bike.c index 615b87a0b8..0000ff181b 100644 --- a/src/bike.c +++ b/src/bike.c @@ -226,7 +226,7 @@ static void MachBikeTransition_TrySpeedUp(u8 direction) { // we hit a solid object that is not a ledge, so perform the collision. Bike_SetBikeStill(); - if (collision == COLLISION_EVENT_OBJECT && IsPlayerCollidingWithFarawayIslandMew(direction)) + if (collision == COLLISION_OBJECT_EVENT && IsPlayerCollidingWithFarawayIslandMew(direction)) PlayerOnBikeCollideWithFarawayIslandMew(direction); else if (collision < COLLISION_STOP_SURFING || collision > COLLISION_ROTATING_GATE) PlayerOnBikeCollide(direction); @@ -261,7 +261,7 @@ static void MachBikeTransition_TrySlowDown(u8 direction) else { Bike_SetBikeStill(); - if (collision == COLLISION_EVENT_OBJECT && IsPlayerCollidingWithFarawayIslandMew(direction)) + if (collision == COLLISION_OBJECT_EVENT && IsPlayerCollidingWithFarawayIslandMew(direction)) PlayerOnBikeCollideWithFarawayIslandMew(direction); else if (collision < COLLISION_STOP_SURFING || collision > COLLISION_ROTATING_GATE) PlayerOnBikeCollide(direction); @@ -557,7 +557,7 @@ static void AcroBikeTransition_Moving(u8 direction) { if (collision == COLLISION_LEDGE_JUMP) PlayerJumpLedge(direction); - else if (collision == COLLISION_EVENT_OBJECT && IsPlayerCollidingWithFarawayIslandMew(direction)) + else if (collision == COLLISION_OBJECT_EVENT && IsPlayerCollidingWithFarawayIslandMew(direction)) PlayerOnBikeCollideWithFarawayIslandMew(direction); else if (collision < COLLISION_STOP_SURFING || collision > COLLISION_ROTATING_GATE) PlayerOnBikeCollide(direction); @@ -880,7 +880,7 @@ static u8 GetBikeCollisionAt(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 d { u8 collision = CheckForObjectEventCollision(objectEvent, x, y, direction, metatitleBehavior); - if (collision > COLLISION_EVENT_OBJECT) + if (collision > COLLISION_OBJECT_EVENT) return collision; if (collision == COLLISION_NONE && IsRunningDisallowedByMetatile(metatitleBehavior)) diff --git a/src/cable_car.c b/src/cable_car.c index 25ebf91091..e629300b1b 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -768,15 +768,15 @@ static void LoadCableCarSprites(void) u8 i; u8 playerGraphicsIds[2] = { - EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, - EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, + OBJ_EVENT_GFX_RIVAL_MAY_NORMAL }; u16 rval = Random(); u8 hikerGraphicsIds[4] = { - EVENT_OBJ_GFX_HIKER, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_ZIGZAGOON_1 + OBJ_EVENT_GFX_HIKER, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_ZIGZAGOON_1 }; s16 hikerCoords[2][2] = { { 0, 80 }, diff --git a/src/contest.c b/src/contest.c index 4830e05d5e..63d5ecc073 100644 --- a/src/contest.c +++ b/src/contest.c @@ -2615,9 +2615,9 @@ void sub_80DA8C8(u8 partyIndex) } memcpy(gContestMons[gContestPlayerMonIndex].trainerName, name, 8); if (gSaveBlock2Ptr->playerGender == MALE) - gContestMons[gContestPlayerMonIndex].trainerGfxId = EVENT_OBJ_GFX_LINK_BRENDAN; + gContestMons[gContestPlayerMonIndex].trainerGfxId = OBJ_EVENT_GFX_LINK_BRENDAN; else - gContestMons[gContestPlayerMonIndex].trainerGfxId = EVENT_OBJ_GFX_LINK_MAY; + gContestMons[gContestPlayerMonIndex].trainerGfxId = OBJ_EVENT_GFX_LINK_MAY; gContestMons[gContestPlayerMonIndex].aiChecks = 0; gContestMons[gContestPlayerMonIndex].unk2C[0] = 0; gContestMons[gContestPlayerMonIndex].species = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPECIES); diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h index 010559e3b1..8fa7467255 100644 --- a/src/data/contest_opponents.h +++ b/src/data/contest_opponents.h @@ -182,7 +182,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_POOCHYENA, .nickname = _("POOCHY"), .trainerName = _("JIMMY"), - .trainerGfxId = EVENT_OBJ_GFX_BOY_1, + .trainerGfxId = OBJ_EVENT_GFX_BOY_1, .aiChecks = 0xC000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -211,7 +211,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ILLUMISE, .nickname = _("MUSILLE"), .trainerName = _("EDITH"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_1, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -240,7 +240,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DUSTOX, .nickname = _("DUSTER"), .trainerName = _("EVAN"), - .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY, + .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiChecks = 0x21000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -269,7 +269,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SEEDOT, .nickname = _("DOTS"), .trainerName = _("KELSEY"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiChecks = 0x20800FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -298,7 +298,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_TAILLOW, .nickname = _("TATAY"), .trainerName = _("MADISON"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -327,7 +327,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_NINCADA, .nickname = _("NINDA"), .trainerName = _("RAYMOND"), - .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT, + .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiChecks = 0x10200FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -356,7 +356,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SHROOMISH, .nickname = _("SMISH"), .trainerName = _("GRANT"), - .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER, + .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiChecks = 0x20100FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -385,7 +385,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SPHEAL, .nickname = _("SLEAL"), .trainerName = _("PAIGE"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiChecks = 0x8080FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -414,7 +414,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SLAKOTH, .nickname = _("SLOKTH"), .trainerName = _("ALEC"), - .trainerGfxId = EVENT_OBJ_GFX_CAMPER, + .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiChecks = 0x40040FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -443,7 +443,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_WHISMUR, .nickname = _("WHIRIS"), .trainerName = _("SYDNEY"), - .trainerGfxId = EVENT_OBJ_GFX_LASS, + .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiChecks = 0x80020FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -472,7 +472,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MAKUHITA, .nickname = _("MAHITA"), .trainerName = _("MORRIS"), - .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiChecks = 0x8010FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -501,7 +501,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ARON, .nickname = _("RONAR"), .trainerName = _("MARIAH"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_2, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiChecks = 0x8008FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -530,7 +530,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_CROBAT, .nickname = _("BATRO"), .trainerName = _("RUSSELL"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_3, + .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiChecks = 0x90004FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -559,7 +559,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_GULPIN, .nickname = _("GULIN"), .trainerName = _("MELANIE"), - .trainerGfxId = EVENT_OBJ_GFX_TWIN, + .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiChecks = 0x40002FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -588,7 +588,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MANECTRIC, .nickname = _("RIKELEC"), .trainerName = _("CHANCE"), - .trainerGfxId = EVENT_OBJ_GFX_RICH_BOY, + .trainerGfxId = OBJ_EVENT_GFX_RICH_BOY, .aiChecks = 0x80001FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -617,7 +617,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BULBASAUR, .nickname = _("BULBY"), .trainerName = _("AGATHA"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2, .aiChecks = 0xC000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -646,7 +646,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BUTTERFREE, .nickname = _("FUTTERBE"), .trainerName = _("BEAU"), - .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC, + .trainerGfxId = OBJ_EVENT_GFX_HEX_MANIAC, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -675,7 +675,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_PIDGEOTTO, .nickname = _("PIDEOT"), .trainerName = _("KAY"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_5, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_5, .aiChecks = 0x21000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -704,7 +704,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DIGLETT, .nickname = _("DIGLE"), .trainerName = _("CALE"), - .trainerGfxId = EVENT_OBJ_GFX_HIKER, + .trainerGfxId = OBJ_EVENT_GFX_HIKER, .aiChecks = 0x20800FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -733,7 +733,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_POLIWAG, .nickname = _("WAGIL"), .trainerName = _("CAITLIN"), - .trainerGfxId = EVENT_OBJ_GFX_TUBER_F, + .trainerGfxId = OBJ_EVENT_GFX_TUBER_F, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -762,7 +762,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_TOTODILE, .nickname = _("TOTDIL"), .trainerName = _("COLBY"), - .trainerGfxId = EVENT_OBJ_GFX_NINJA_BOY, + .trainerGfxId = OBJ_EVENT_GFX_NINJA_BOY, .aiChecks = 0x10200FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -791,7 +791,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LEDYBA, .nickname = _("BALEDY"), .trainerName = _("KYLIE"), - .trainerGfxId = EVENT_OBJ_GFX_BEAUTY, + .trainerGfxId = OBJ_EVENT_GFX_BEAUTY, .aiChecks = 0x20100FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -820,7 +820,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DELIBIRD, .nickname = _("BIRDLY"), .trainerName = _("LIAM"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_5, + .trainerGfxId = OBJ_EVENT_GFX_MAN_5, .aiChecks = 0x8080FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -849,7 +849,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LARVITAR, .nickname = _("TARVITAR"), .trainerName = _("MILO"), - .trainerGfxId = EVENT_OBJ_GFX_MANIAC, + .trainerGfxId = OBJ_EVENT_GFX_MANIAC, .aiChecks = 0x40040FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -878,7 +878,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ROSELIA, .nickname = _("RELIA"), .trainerName = _("KARINA"), - .trainerGfxId = EVENT_OBJ_GFX_PICNICKER, + .trainerGfxId = OBJ_EVENT_GFX_PICNICKER, .aiChecks = 0x24000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -907,7 +907,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DODRIO, .nickname = _("DUODO"), .trainerName = _("BOBBY"), - .trainerGfxId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + .trainerGfxId = OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -936,7 +936,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_TRAPINCH, .nickname = _("PINCHIN"), .trainerName = _("CLAIRE"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_1, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiChecks = 0x81000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -965,7 +965,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_CACNEA, .nickname = _("NACAC"), .trainerName = _("WILLIE"), - .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY, + .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiChecks = 0x80800FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -994,7 +994,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SANDSLASH, .nickname = _("SHRAND"), .trainerName = _("CASSIDY"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiChecks = 0x10400FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1023,7 +1023,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BALTOY, .nickname = _("TOYBAL"), .trainerName = _("MORGAN"), - .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT, + .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiChecks = 0x8200FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1052,7 +1052,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MEDICHAM, .nickname = _("CHAMCHAM"), .trainerName = _("SUMMER"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiChecks = 0x10100FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1081,7 +1081,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SPINDA, .nickname = _("SPININ"), .trainerName = _("MILES"), - .trainerGfxId = EVENT_OBJ_GFX_CAMPER, + .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiChecks = 0x80080FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1110,7 +1110,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SWABLU, .nickname = _("SWABY"), .trainerName = _("AUDREY"), - .trainerGfxId = EVENT_OBJ_GFX_LASS, + .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiChecks = 0xA0040FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1139,7 +1139,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SPOINK, .nickname = _("POINKER"), .trainerName = _("AVERY"), - .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiChecks = 0x80020FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1168,7 +1168,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_KECLEON, .nickname = _("KECON"), .trainerName = _("ARIANA"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_2, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiChecks = 0x80010FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1197,7 +1197,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_GOLDEEN, .nickname = _("GOLDEN"), .trainerName = _("ASHTON"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_3, + .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiChecks = 0x80008FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1226,7 +1226,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BARBOACH, .nickname = _("BOBOACH"), .trainerName = _("SANDRA"), - .trainerGfxId = EVENT_OBJ_GFX_TWIN, + .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiChecks = 0x80004FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1255,7 +1255,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SKARMORY, .nickname = _("CORPY"), .trainerName = _("CARSON"), - .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER, + .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiChecks = 0x8002FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1284,7 +1284,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LOTAD, .nickname = _("TADO"), .trainerName = _("KATRINA"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiChecks = 0x8001FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1313,7 +1313,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SLOWBRO, .nickname = _("BROWLO"), .trainerName = _("LUKE"), - .trainerGfxId = EVENT_OBJ_GFX_FAT_MAN, + .trainerGfxId = OBJ_EVENT_GFX_FAT_MAN, .aiChecks = 0xC000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1342,7 +1342,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_FARFETCHD, .nickname = _("FETCHIN"), .trainerName = _("RAUL"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_5, + .trainerGfxId = OBJ_EVENT_GFX_MAN_5, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1371,7 +1371,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SEEL, .nickname = _("SEELEY"), .trainerName = _("JADA"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2, .aiChecks = 0x21000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1400,7 +1400,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DROWZEE, .nickname = _("DROWZIN"), .trainerName = _("ZEEK"), - .trainerGfxId = EVENT_OBJ_GFX_PSYCHIC_M, + .trainerGfxId = OBJ_EVENT_GFX_PSYCHIC_M, .aiChecks = 0x20800FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1429,7 +1429,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_HITMONCHAN, .nickname = _("HITEMON"), .trainerName = _("DIEGO"), - .trainerGfxId = EVENT_OBJ_GFX_EXPERT_M, + .trainerGfxId = OBJ_EVENT_GFX_EXPERT_M, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1458,7 +1458,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BLISSEY, .nickname = _("BLISS"), .trainerName = _("ALIYAH"), - .trainerGfxId = EVENT_OBJ_GFX_TEALA, + .trainerGfxId = OBJ_EVENT_GFX_TEALA, .aiChecks = 0x10200FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1487,7 +1487,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ELEKID, .nickname = _("KIDLEK"), .trainerName = _("NATALIA"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiChecks = 0x20100FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1516,7 +1516,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SNUBBULL, .nickname = _("SNUBBINS"), .trainerName = _("DEVIN"), - .trainerGfxId = EVENT_OBJ_GFX_GENTLEMAN, + .trainerGfxId = OBJ_EVENT_GFX_GENTLEMAN, .aiChecks = 0x8080FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1545,7 +1545,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MISDREAVUS, .nickname = _("DREAVIS"), .trainerName = _("TYLOR"), - .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC, + .trainerGfxId = OBJ_EVENT_GFX_HEX_MANIAC, .aiChecks = 0x40040FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1574,7 +1574,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LAIRON, .nickname = _("LAIRN"), .trainerName = _("RONNIE"), - .trainerGfxId = EVENT_OBJ_GFX_HIKER, + .trainerGfxId = OBJ_EVENT_GFX_HIKER, .aiChecks = 0x84000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1603,7 +1603,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SHIFTRY, .nickname = _("SHIFTY"), .trainerName = _("CLAUDIA"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_1, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -1632,7 +1632,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_NINJASK, .nickname = _("NINAS"), .trainerName = _("ELIAS"), - .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY, + .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiChecks = 0x81000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1661,7 +1661,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SWELLOW, .nickname = _("WELOW"), .trainerName = _("JADE"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiChecks = 0x80800FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -1690,7 +1690,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MIGHTYENA, .nickname = _("YENA"), .trainerName = _("FRANCIS"), - .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT, + .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1719,7 +1719,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BEAUTIFLY, .nickname = _("TIFLY"), .trainerName = _("ALISHA"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiChecks = 0x80200FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1748,7 +1748,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SEAKING, .nickname = _("KINGSEA"), .trainerName = _("SAUL"), - .trainerGfxId = EVENT_OBJ_GFX_CAMPER, + .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiChecks = 0x80100FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -1777,7 +1777,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_CASTFORM, .nickname = _("CASTER"), .trainerName = _("FELICIA"), - .trainerGfxId = EVENT_OBJ_GFX_LASS, + .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiChecks = 0x80080FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -1806,7 +1806,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MACHOKE, .nickname = _("CHOKEM"), .trainerName = _("EMILIO"), - .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiChecks = 0x80040FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -1835,7 +1835,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LOMBRE, .nickname = _("LOMBE"), .trainerName = _("KARLA"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_2, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiChecks = 0x80020FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1864,7 +1864,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SEVIPER, .nickname = _("VIPES"), .trainerName = _("DARRYL"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_3, + .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiChecks = 0x80010FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1893,7 +1893,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_WAILMER, .nickname = _("MERAIL"), .trainerName = _("SELENA"), - .trainerGfxId = EVENT_OBJ_GFX_EXPERT_F, + .trainerGfxId = OBJ_EVENT_GFX_EXPERT_F, .aiChecks = 0x80008FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1922,7 +1922,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MAGIKARP, .nickname = _("KARPAG"), .trainerName = _("NOEL"), - .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER, + .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiChecks = 0x80004FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1951,7 +1951,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LUNATONE, .nickname = _("LUNONE"), .trainerName = _("LACEY"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiChecks = 0x80002FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1980,7 +1980,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ABSOL, .nickname = _("ABSO"), .trainerName = _("CORBIN"), - .trainerGfxId = EVENT_OBJ_GFX_MANIAC, + .trainerGfxId = OBJ_EVENT_GFX_MANIAC, .aiChecks = 0x80001FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -2009,7 +2009,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_EXEGGUTOR, .nickname = _("EGGSOR"), .trainerName = _("GRACIE"), - .trainerGfxId = EVENT_OBJ_GFX_PICNICKER, + .trainerGfxId = OBJ_EVENT_GFX_PICNICKER, .aiChecks = 0xC000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2038,7 +2038,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_CUBONE, .nickname = _("CUBIN"), .trainerName = _("COLTIN"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_4, + .trainerGfxId = OBJ_EVENT_GFX_MAN_4, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2067,7 +2067,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_HITMONLEE, .nickname = _("HITMON"), .trainerName = _("ELLIE"), - .trainerGfxId = EVENT_OBJ_GFX_EXPERT_F, + .trainerGfxId = OBJ_EVENT_GFX_EXPERT_F, .aiChecks = 0x21000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -2096,7 +2096,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SQUIRTLE, .nickname = _("SURTLE"), .trainerName = _("MARCUS"), - .trainerGfxId = EVENT_OBJ_GFX_SAILOR, + .trainerGfxId = OBJ_EVENT_GFX_SAILOR, .aiChecks = 0x20800FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2125,7 +2125,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_KANGASKHAN, .nickname = _("KHANKAN"), .trainerName = _("KIARA"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_3, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_3, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -2154,7 +2154,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_PINECO, .nickname = _("PINOC"), .trainerName = _("BRYCE"), - .trainerGfxId = EVENT_OBJ_GFX_BUG_CATCHER, + .trainerGfxId = OBJ_EVENT_GFX_BUG_CATCHER, .aiChecks = 0x10200FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2183,7 +2183,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DUNSPARCE, .nickname = _("DILTOT"), .trainerName = _("JAMIE"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_5, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_5, .aiChecks = 0x20100FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2212,7 +2212,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_HOUNDOOM, .nickname = _("DOOMOND"), .trainerName = _("JORGE"), - .trainerGfxId = EVENT_OBJ_GFX_GENTLEMAN, + .trainerGfxId = OBJ_EVENT_GFX_GENTLEMAN, .aiChecks = 0x8080FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -2241,7 +2241,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MILTANK, .nickname = _("MILKAN"), .trainerName = _("DEVON"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_M, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_M, .aiChecks = 0x40040FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2270,7 +2270,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_GYARADOS, .nickname = _("RADOS"), .trainerName = _("JUSTINA"), - .trainerGfxId = EVENT_OBJ_GFX_PICNICKER, + .trainerGfxId = OBJ_EVENT_GFX_PICNICKER, .aiChecks = 0x84000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2299,7 +2299,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LOUDRED, .nickname = _("LOUDERD"), .trainerName = _("RALPH"), - .trainerGfxId = EVENT_OBJ_GFX_EXPERT_M, + .trainerGfxId = OBJ_EVENT_GFX_EXPERT_M, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2328,7 +2328,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SKITTY, .nickname = _("SITTY"), .trainerName = _("ROSA"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_1, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiChecks = 0x81000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2357,7 +2357,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SLAKING, .nickname = _("SLING"), .trainerName = _("KEATON"), - .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY, + .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiChecks = 0x80800FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2386,7 +2386,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ALTARIA, .nickname = _("TARIA"), .trainerName = _("MAYRA"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2415,7 +2415,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_KIRLIA, .nickname = _("LIRKI"), .trainerName = _("LAMAR"), - .trainerGfxId = EVENT_OBJ_GFX_RICH_BOY, + .trainerGfxId = OBJ_EVENT_GFX_RICH_BOY, .aiChecks = 0x80200FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2444,7 +2444,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BELLOSSOM, .nickname = _("BLOSSOM"), .trainerName = _("AUBREY"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiChecks = 0x80100FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2473,7 +2473,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SABLEYE, .nickname = _("EYESAB"), .trainerName = _("NIGEL"), - .trainerGfxId = EVENT_OBJ_GFX_CAMPER, + .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiChecks = 0x80080FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2502,7 +2502,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_NATU, .nickname = _("UTAN"), .trainerName = _("CAMILLE"), - .trainerGfxId = EVENT_OBJ_GFX_LASS, + .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiChecks = 0x80040FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2531,7 +2531,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SHARPEDO, .nickname = _("PEDOS"), .trainerName = _("DEON"), - .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiChecks = 0x80020FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2560,7 +2560,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LUVDISC, .nickname = _("LUVIS"), .trainerName = _("JANELLE"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_2, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiChecks = 0x80010FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2589,7 +2589,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_HERACROSS, .nickname = _("HEROSS"), .trainerName = _("HEATH"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_3, + .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiChecks = 0x80008FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2618,7 +2618,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ELECTRODE, .nickname = _("RODLECT"), .trainerName = _("SASHA"), - .trainerGfxId = EVENT_OBJ_GFX_TWIN, + .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiChecks = 0x80004FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2647,7 +2647,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_PICHU, .nickname = _("CHUPY"), .trainerName = _("FRANKIE"), - .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER, + .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiChecks = 0x80002FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2676,7 +2676,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_WOBBUFFET, .nickname = _("WOBET"), .trainerName = _("HELEN"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiChecks = 0x80001FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2705,7 +2705,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_GENGAR, .nickname = _("GAREN"), .trainerName = _("CAMILE"), - .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC, + .trainerGfxId = OBJ_EVENT_GFX_HEX_MANIAC, .aiChecks = 0xC000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2734,7 +2734,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_PORYGON, .nickname = _("GONPOR"), .trainerName = _("MARTIN"), - .trainerGfxId = EVENT_OBJ_GFX_SCIENTIST_1, + .trainerGfxId = OBJ_EVENT_GFX_SCIENTIST_1, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2763,7 +2763,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DRAGONITE, .nickname = _("DRITE"), .trainerName = _("SERGIO"), - .trainerGfxId = EVENT_OBJ_GFX_BOY_1, + .trainerGfxId = OBJ_EVENT_GFX_BOY_1, .aiChecks = 0x21000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2792,7 +2792,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MEOWTH, .nickname = _("MEOWY"), .trainerName = _("KAILEY"), - .trainerGfxId = EVENT_OBJ_GFX_TWIN, + .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiChecks = 0x20800FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2821,7 +2821,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_JYNX, .nickname = _("NYX"), .trainerName = _("PERLA"), - .trainerGfxId = EVENT_OBJ_GFX_BEAUTY, + .trainerGfxId = OBJ_EVENT_GFX_BEAUTY, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2850,7 +2850,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_TOGEPI, .nickname = _("GEPITO"), .trainerName = _("CLARA"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2, .aiChecks = 0x10200FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2879,7 +2879,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ESPEON, .nickname = _("SPEON"), .trainerName = _("JAKOB"), - .trainerGfxId = EVENT_OBJ_GFX_PSYCHIC_M, + .trainerGfxId = OBJ_EVENT_GFX_PSYCHIC_M, .aiChecks = 0x20100FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2908,7 +2908,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SLOWKING, .nickname = _("SLOWGO"), .trainerName = _("TREY"), - .trainerGfxId = EVENT_OBJ_GFX_SAILOR, + .trainerGfxId = OBJ_EVENT_GFX_SAILOR, .aiChecks = 0x8080FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2937,7 +2937,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_URSARING, .nickname = _("URSING"), .trainerName = _("LANE"), - .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT, + .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiChecks = 0x40040FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, diff --git a/src/data/decoration/tiles.h b/src/data/decoration/tiles.h index 2b91cb53d4..f115205119 100644 --- a/src/data/decoration/tiles.h +++ b/src/data/decoration/tiles.h @@ -461,181 +461,181 @@ const u16 DecorGfx_KISS_POSTER[] = { }; const u16 DecorGfx_PICHU_DOLL[] = { - EVENT_OBJ_GFX_PICHU_DOLL + OBJ_EVENT_GFX_PICHU_DOLL }; const u16 DecorGfx_PIKACHU_DOLL[] = { - EVENT_OBJ_GFX_PIKACHU_DOLL + OBJ_EVENT_GFX_PIKACHU_DOLL }; const u16 DecorGfx_MARILL_DOLL[] = { - EVENT_OBJ_GFX_MARILL_DOLL + OBJ_EVENT_GFX_MARILL_DOLL }; const u16 DecorGfx_TOGEPI_DOLL[] = { - EVENT_OBJ_GFX_TOGEPI_DOLL + OBJ_EVENT_GFX_TOGEPI_DOLL }; const u16 DecorGfx_CYNDAQUIL_DOLL[] = { - EVENT_OBJ_GFX_CYNDAQUIL_DOLL + OBJ_EVENT_GFX_CYNDAQUIL_DOLL }; const u16 DecorGfx_CHIKORITA_DOLL[] = { - EVENT_OBJ_GFX_CHIKORITA_DOLL + OBJ_EVENT_GFX_CHIKORITA_DOLL }; const u16 DecorGfx_TOTODILE_DOLL[] = { - EVENT_OBJ_GFX_TOTODILE_DOLL + OBJ_EVENT_GFX_TOTODILE_DOLL }; const u16 DecorGfx_JIGGLYPUFF_DOLL[] = { - EVENT_OBJ_GFX_JIGGLYPUFF_DOLL + OBJ_EVENT_GFX_JIGGLYPUFF_DOLL }; const u16 DecorGfx_MEOWTH_DOLL[] = { - EVENT_OBJ_GFX_MEOWTH_DOLL + OBJ_EVENT_GFX_MEOWTH_DOLL }; const u16 DecorGfx_CLEFAIRY_DOLL[] = { - EVENT_OBJ_GFX_CLEFAIRY_DOLL + OBJ_EVENT_GFX_CLEFAIRY_DOLL }; const u16 DecorGfx_DITTO_DOLL[] = { - EVENT_OBJ_GFX_DITTO_DOLL + OBJ_EVENT_GFX_DITTO_DOLL }; const u16 DecorGfx_SMOOCHUM_DOLL[] = { - EVENT_OBJ_GFX_SMOOCHUM_DOLL + OBJ_EVENT_GFX_SMOOCHUM_DOLL }; const u16 DecorGfx_TREECKO_DOLL[] = { - EVENT_OBJ_GFX_TREECKO_DOLL + OBJ_EVENT_GFX_TREECKO_DOLL }; const u16 DecorGfx_TORCHIC_DOLL[] = { - EVENT_OBJ_GFX_TORCHIC_DOLL + OBJ_EVENT_GFX_TORCHIC_DOLL }; const u16 DecorGfx_MUDKIP_DOLL[] = { - EVENT_OBJ_GFX_MUDKIP_DOLL + OBJ_EVENT_GFX_MUDKIP_DOLL }; const u16 DecorGfx_DUSKULL_DOLL[] = { - EVENT_OBJ_GFX_DUSKULL_DOLL + OBJ_EVENT_GFX_DUSKULL_DOLL }; const u16 DecorGfx_WYNAUT_DOLL[] = { - EVENT_OBJ_GFX_WYNAUT_DOLL + OBJ_EVENT_GFX_WYNAUT_DOLL }; const u16 DecorGfx_BALTOY_DOLL[] = { - EVENT_OBJ_GFX_BALTOY_DOLL + OBJ_EVENT_GFX_BALTOY_DOLL }; const u16 DecorGfx_KECLEON_DOLL[] = { - EVENT_OBJ_GFX_KECLEON_DOLL + OBJ_EVENT_GFX_KECLEON_DOLL }; const u16 DecorGfx_AZURILL_DOLL[] = { - EVENT_OBJ_GFX_AZURILL_DOLL + OBJ_EVENT_GFX_AZURILL_DOLL }; const u16 DecorGfx_SKITTY_DOLL[] = { - EVENT_OBJ_GFX_SKITTY_DOLL + OBJ_EVENT_GFX_SKITTY_DOLL }; const u16 DecorGfx_SWABLU_DOLL[] = { - EVENT_OBJ_GFX_SWABLU_DOLL + OBJ_EVENT_GFX_SWABLU_DOLL }; const u16 DecorGfx_GULPIN_DOLL[] = { - EVENT_OBJ_GFX_GULPIN_DOLL + OBJ_EVENT_GFX_GULPIN_DOLL }; const u16 DecorGfx_LOTAD_DOLL[] = { - EVENT_OBJ_GFX_LOTAD_DOLL + OBJ_EVENT_GFX_LOTAD_DOLL }; const u16 DecorGfx_SEEDOT_DOLL[] = { - EVENT_OBJ_GFX_SEEDOT_DOLL + OBJ_EVENT_GFX_SEEDOT_DOLL }; const u16 DecorGfx_PIKA_CUSHION[] = { - EVENT_OBJ_GFX_PIKA_CUSHION + OBJ_EVENT_GFX_PIKA_CUSHION }; const u16 DecorGfx_ROUND_CUSHION[] = { - EVENT_OBJ_GFX_ROUND_CUSHION + OBJ_EVENT_GFX_ROUND_CUSHION }; const u16 DecorGfx_KISS_CUSHION[] = { - EVENT_OBJ_GFX_KISS_CUSHION + OBJ_EVENT_GFX_KISS_CUSHION }; const u16 DecorGfx_ZIGZAG_CUSHION[] = { - EVENT_OBJ_GFX_ZIGZAG_CUSHION + OBJ_EVENT_GFX_ZIGZAG_CUSHION }; const u16 DecorGfx_SPIN_CUSHION[] = { - EVENT_OBJ_GFX_SPIN_CUSHION + OBJ_EVENT_GFX_SPIN_CUSHION }; const u16 DecorGfx_DIAMOND_CUSHION[] = { - EVENT_OBJ_GFX_DIAMOND_CUSHION + OBJ_EVENT_GFX_DIAMOND_CUSHION }; const u16 DecorGfx_BALL_CUSHION[] = { - EVENT_OBJ_GFX_BALL_CUSHION + OBJ_EVENT_GFX_BALL_CUSHION }; const u16 DecorGfx_GRASS_CUSHION[] = { - EVENT_OBJ_GFX_GRASS_CUSHION + OBJ_EVENT_GFX_GRASS_CUSHION }; const u16 DecorGfx_FIRE_CUSHION[] = { - EVENT_OBJ_GFX_FIRE_CUSHION + OBJ_EVENT_GFX_FIRE_CUSHION }; const u16 DecorGfx_WATER_CUSHION[] = { - EVENT_OBJ_GFX_WATER_CUSHION + OBJ_EVENT_GFX_WATER_CUSHION }; const u16 DecorGfx_SNORLAX_DOLL[] = { - EVENT_OBJ_GFX_BIG_SNORLAX_DOLL + OBJ_EVENT_GFX_BIG_SNORLAX_DOLL }; const u16 DecorGfx_RHYDON_DOLL[] = { - EVENT_OBJ_GFX_BIG_RHYDON_DOLL + OBJ_EVENT_GFX_BIG_RHYDON_DOLL }; const u16 DecorGfx_LAPRAS_DOLL[] = { - EVENT_OBJ_GFX_BIG_LAPRAS_DOLL + OBJ_EVENT_GFX_BIG_LAPRAS_DOLL }; const u16 DecorGfx_VENUSAUR_DOLL[] = { - EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL + OBJ_EVENT_GFX_BIG_VENUSAUR_DOLL }; const u16 DecorGfx_CHARIZARD_DOLL[] = { - EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL + OBJ_EVENT_GFX_BIG_CHARIZARD_DOLL }; const u16 DecorGfx_BLASTOISE_DOLL[] = { - EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL + OBJ_EVENT_GFX_BIG_BLASTOISE_DOLL }; const u16 DecorGfx_WAILMER_DOLL[] = { - EVENT_OBJ_GFX_BIG_WAILMER_DOLL + OBJ_EVENT_GFX_BIG_WAILMER_DOLL }; const u16 DecorGfx_REGIROCK_DOLL[] = { - EVENT_OBJ_GFX_BIG_REGIROCK_DOLL + OBJ_EVENT_GFX_BIG_REGIROCK_DOLL }; const u16 DecorGfx_REGICE_DOLL[] = { - EVENT_OBJ_GFX_BIG_REGICE_DOLL + OBJ_EVENT_GFX_BIG_REGICE_DOLL }; const u16 DecorGfx_REGISTEEL_DOLL[] = { - EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL + OBJ_EVENT_GFX_BIG_REGISTEEL_DOLL }; diff --git a/src/data/event_object/berry_tree_graphics_tables.h b/src/data/event_object/berry_tree_graphics_tables.h index 75c4bd03c0..d558b583f8 100755 --- a/src/data/event_object/berry_tree_graphics_tables.h +++ b/src/data/event_object/berry_tree_graphics_tables.h @@ -418,9 +418,9 @@ const struct SpriteFrameImage gObjectEventPicTable_TamatoBerryTree[] = { const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; -const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES}; +const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES}; -const u8 gBerryTreeObjectEventGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES}; +const u8 gBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES}; const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CheriBerryTree, diff --git a/src/data/event_object/event_object_graphics_info.h b/src/data/event_object/event_object_graphics_info.h index 9b500d0645..cb221a30bd 100755 --- a/src/data/event_object/event_object_graphics_info.h +++ b/src/data/event_object/event_object_graphics_info.h @@ -1,245 +1,245 @@ -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump = {0xFFFF, EVENT_OBJ_PAL_TAG_12, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_QuintyPlump, gObjectEventPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NinjaBoy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Twin, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy3, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl3, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RichBoy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman4, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cook, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LinkReceptionist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man3, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman5, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PsychicM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maniac, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HexManiac, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BlackBelt, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisherman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, NULL, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfBirch, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man4, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man5, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_CuttableTree, gObjectEventPicTable_CuttableTree, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MartEmployee, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Teala, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BreakableRock, gObjectEventPicTable_BreakableRock, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xFFFF, EVENT_OBJ_PAL_TAG_14, EVENT_OBJ_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_Truck, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_16, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xFFFF, EVENT_OBJ_PAL_TAG_27, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poochyena, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Artist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cameraman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MovingBox, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xFFFF, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CableCar, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DevonEmployee, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sidney, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Phoebe, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Glacia, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Drake, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Roxanne, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brawly, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wattson, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Flannery, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Norman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Winona, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Liza, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tate, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wallace, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Steven, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wally, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_MayFishing, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xFFFF, EVENT_OBJ_PAL_TAG_21, EVENT_OBJ_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SSTidal, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xFFFF, EVENT_OBJ_PAL_TAG_26, EVENT_OBJ_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SubmarineShadow, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PichuDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MarillDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DittoDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WynautDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LotadDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikaCushion, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_RoundCushion, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KissCushion, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SpinCushion, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BallCushion, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GrassCushion, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_FireCushion, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WaterCushion, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GameboyKid, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ContestJudge, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayWatering, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MayDecorating, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Archie, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maxie, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreSide, gObjectEventRotScalAnimTable_KyogreGroudon}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon3 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Groudon3, gObjectEventPicTable_GroudonSide, gObjectEventRotScalAnimTable_KyogreGroudon}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Skitty, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2 = {0xFFFF, EVENT_OBJ_PAL_TAG_22, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_24, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Rayquaza2, gObjectEventPicTable_Rayquaza, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azumarill, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wingull, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_10, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azurill, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Juan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scott, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Statue, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kirlia, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Dusclops, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Red, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Leaf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mew, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys = {0xFFFF, EVENT_OBJ_PAL_TAG_29, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Deoxys, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone = {0xFFFF, EVENT_OBJ_PAL_TAG_30, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Anabel, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tucker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Greta, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Spenser, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Noland, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lucy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brandon, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_33, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay = {0xFFFF, EVENT_OBJ_PAL_TAG_34, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lugia, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {0xFFFF, EVENT_OBJ_PAL_TAG_31, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOh, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump = {0xFFFF, OBJ_EVENT_PAL_TAG_12, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_QuintyPlump, gObjectEventPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NinjaBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Twin, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2 = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3 = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RichBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4 = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cook, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LinkReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PsychicM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maniac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HexManiac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BlackBelt, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisherman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, NULL, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfBirch, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4 = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_CuttableTree, gObjectEventPicTable_CuttableTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MartEmployee, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Teala, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BreakableRock, gObjectEventPicTable_BreakableRock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xFFFF, OBJ_EVENT_PAL_TAG_14, OBJ_EVENT_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_Truck, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox = {0xFFFF, OBJ_EVENT_PAL_TAG_15, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway = {0xFFFF, OBJ_EVENT_PAL_TAG_15, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon = {0xFFFF, OBJ_EVENT_PAL_TAG_16, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xFFFF, OBJ_EVENT_PAL_TAG_27, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poochyena, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Artist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cameraman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {0xFFFF, OBJ_EVENT_PAL_TAG_11, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {0xFFFF, OBJ_EVENT_PAL_TAG_11, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {0xFFFF, OBJ_EVENT_PAL_TAG_19, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MovingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xFFFF, OBJ_EVENT_PAL_TAG_20, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CableCar, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DevonEmployee, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sidney, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Phoebe, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Glacia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Drake, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Roxanne, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brawly, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wattson, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Flannery, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Norman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Winona, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Liza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tate, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wallace, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Steven, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wally, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_MayFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xFFFF, OBJ_EVENT_PAL_TAG_21, OBJ_EVENT_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SSTidal, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xFFFF, OBJ_EVENT_PAL_TAG_26, OBJ_EVENT_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SubmarineShadow, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PichuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MarillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DittoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WynautDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LotadDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikaCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_RoundCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KissCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SpinCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BallCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GrassCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_FireCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WaterCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GameboyKid, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ContestJudge, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MayDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Archie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maxie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1 = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre3 = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreSide, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon3 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Groudon3, gObjectEventPicTable_GroudonSide, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Skitty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2 = {0xFFFF, OBJ_EVENT_PAL_TAG_22, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2 = {0xFFFF, OBJ_EVENT_PAL_TAG_24, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Rayquaza2, gObjectEventPicTable_Rayquaza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azumarill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wingull, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_10, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azurill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Juan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scott, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Statue, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kirlia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Dusclops, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red = {0xFFFF, OBJ_EVENT_PAL_TAG_28, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Red, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf = {0xFFFF, OBJ_EVENT_PAL_TAG_28, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Leaf, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mew, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys = {0xFFFF, OBJ_EVENT_PAL_TAG_29, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Deoxys, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone = {0xFFFF, OBJ_EVENT_PAL_TAG_30, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Anabel, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tucker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Greta, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Spenser, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Noland, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lucy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brandon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan = {0xFFFF, OBJ_EVENT_PAL_TAG_33, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay = {0xFFFF, OBJ_EVENT_PAL_TAG_34, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {0xFFFF, OBJ_EVENT_PAL_TAG_32, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lugia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {0xFFFF, OBJ_EVENT_PAL_TAG_31, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOh, gDummySpriteAffineAnimTable}; diff --git a/src/data/event_object/event_object_graphics_info_pointers.h b/src/data/event_object/event_object_graphics_info_pointers.h index 3c4ffd2bab..01c8cbde7d 100755 --- a/src/data/event_object/event_object_graphics_info_pointers.h +++ b/src/data/event_object/event_object_graphics_info_pointers.h @@ -247,245 +247,245 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldM const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[] = { - [EVENT_OBJ_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal, - [EVENT_OBJ_GFX_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_BrendanMachBike, - [EVENT_OBJ_GFX_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_BrendanSurfing, - [EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_BrendanFieldMove, - [EVENT_OBJ_GFX_QUINTY_PLUMP] = &gObjectEventGraphicsInfo_QuintyPlump, - [EVENT_OBJ_GFX_NINJA_BOY] = &gObjectEventGraphicsInfo_NinjaBoy, - [EVENT_OBJ_GFX_TWIN] = &gObjectEventGraphicsInfo_Twin, - [EVENT_OBJ_GFX_BOY_1] = &gObjectEventGraphicsInfo_Boy1, - [EVENT_OBJ_GFX_GIRL_1] = &gObjectEventGraphicsInfo_Girl1, - [EVENT_OBJ_GFX_BOY_2] = &gObjectEventGraphicsInfo_Boy2, - [EVENT_OBJ_GFX_GIRL_2] = &gObjectEventGraphicsInfo_Girl2, - [EVENT_OBJ_GFX_LITTLE_BOY] = &gObjectEventGraphicsInfo_LittleBoy, - [EVENT_OBJ_GFX_LITTLE_GIRL] = &gObjectEventGraphicsInfo_LittleGirl, - [EVENT_OBJ_GFX_BOY_3] = &gObjectEventGraphicsInfo_Boy3, - [EVENT_OBJ_GFX_GIRL_3] = &gObjectEventGraphicsInfo_Girl3, - [EVENT_OBJ_GFX_RICH_BOY] = &gObjectEventGraphicsInfo_RichBoy, - [EVENT_OBJ_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1, - [EVENT_OBJ_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan, - [EVENT_OBJ_GFX_POKEFAN_F] = &gObjectEventGraphicsInfo_PokefanF, - [EVENT_OBJ_GFX_MAN_1] = &gObjectEventGraphicsInfo_Man1, - [EVENT_OBJ_GFX_WOMAN_2] = &gObjectEventGraphicsInfo_Woman2, - [EVENT_OBJ_GFX_EXPERT_M] = &gObjectEventGraphicsInfo_ExpertM, - [EVENT_OBJ_GFX_EXPERT_F] = &gObjectEventGraphicsInfo_ExpertF, - [EVENT_OBJ_GFX_MAN_2] = &gObjectEventGraphicsInfo_Man2, - [EVENT_OBJ_GFX_WOMAN_3] = &gObjectEventGraphicsInfo_Woman3, - [EVENT_OBJ_GFX_POKEFAN_M] = &gObjectEventGraphicsInfo_PokefanM, - [EVENT_OBJ_GFX_WOMAN_4] = &gObjectEventGraphicsInfo_Woman4, - [EVENT_OBJ_GFX_COOK] = &gObjectEventGraphicsInfo_Cook, - [EVENT_OBJ_GFX_LINK_RECEPTIONIST] = &gObjectEventGraphicsInfo_LinkReceptionist, - [EVENT_OBJ_GFX_OLD_MAN] = &gObjectEventGraphicsInfo_OldMan, - [EVENT_OBJ_GFX_OLD_WOMAN] = &gObjectEventGraphicsInfo_OldWoman, - [EVENT_OBJ_GFX_CAMPER] = &gObjectEventGraphicsInfo_Camper, - [EVENT_OBJ_GFX_PICNICKER] = &gObjectEventGraphicsInfo_Picnicker, - [EVENT_OBJ_GFX_MAN_3] = &gObjectEventGraphicsInfo_Man3, - [EVENT_OBJ_GFX_WOMAN_5] = &gObjectEventGraphicsInfo_Woman5, - [EVENT_OBJ_GFX_YOUNGSTER] = &gObjectEventGraphicsInfo_Youngster, - [EVENT_OBJ_GFX_BUG_CATCHER] = &gObjectEventGraphicsInfo_BugCatcher, - [EVENT_OBJ_GFX_PSYCHIC_M] = &gObjectEventGraphicsInfo_PsychicM, - [EVENT_OBJ_GFX_SCHOOL_KID_M] = &gObjectEventGraphicsInfo_SchoolKidM, - [EVENT_OBJ_GFX_MANIAC] = &gObjectEventGraphicsInfo_Maniac, - [EVENT_OBJ_GFX_HEX_MANIAC] = &gObjectEventGraphicsInfo_HexManiac, - [EVENT_OBJ_GFX_RAYQUAZA_1] = &gObjectEventGraphicsInfo_Rayquaza1, - [EVENT_OBJ_GFX_SWIMMER_M] = &gObjectEventGraphicsInfo_SwimmerM, - [EVENT_OBJ_GFX_SWIMMER_F] = &gObjectEventGraphicsInfo_SwimmerF, - [EVENT_OBJ_GFX_BLACK_BELT] = &gObjectEventGraphicsInfo_BlackBelt, - [EVENT_OBJ_GFX_BEAUTY] = &gObjectEventGraphicsInfo_Beauty, - [EVENT_OBJ_GFX_SCIENTIST_1] = &gObjectEventGraphicsInfo_Scientist1, - [EVENT_OBJ_GFX_LASS] = &gObjectEventGraphicsInfo_Lass, - [EVENT_OBJ_GFX_GENTLEMAN] = &gObjectEventGraphicsInfo_Gentleman, - [EVENT_OBJ_GFX_SAILOR] = &gObjectEventGraphicsInfo_Sailor, - [EVENT_OBJ_GFX_FISHERMAN] = &gObjectEventGraphicsInfo_Fisherman, - [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_RunningTriathleteM, - [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_RunningTriathleteF, - [EVENT_OBJ_GFX_TUBER_F] = &gObjectEventGraphicsInfo_TuberF, - [EVENT_OBJ_GFX_TUBER_M] = &gObjectEventGraphicsInfo_TuberM, - [EVENT_OBJ_GFX_HIKER] = &gObjectEventGraphicsInfo_Hiker, - [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_CyclingTriathleteM, - [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_CyclingTriathleteF, - [EVENT_OBJ_GFX_NURSE] = &gObjectEventGraphicsInfo_Nurse, - [EVENT_OBJ_GFX_ITEM_BALL] = &gObjectEventGraphicsInfo_ItemBall, - [EVENT_OBJ_GFX_BERRY_TREE] = &gObjectEventGraphicsInfo_BerryTree, - [EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES] = &gObjectEventGraphicsInfo_BerryTreeEarlyStages, - [EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES] = &gObjectEventGraphicsInfo_BerryTreeLateStages, - [EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_BrendanAcroBike, - [EVENT_OBJ_GFX_PROF_BIRCH] = &gObjectEventGraphicsInfo_ProfBirch, - [EVENT_OBJ_GFX_MAN_4] = &gObjectEventGraphicsInfo_Man4, - [EVENT_OBJ_GFX_MAN_5] = &gObjectEventGraphicsInfo_Man5, - [EVENT_OBJ_GFX_REPORTER_M] = &gObjectEventGraphicsInfo_ReporterM, - [EVENT_OBJ_GFX_REPORTER_F] = &gObjectEventGraphicsInfo_ReporterF, - [EVENT_OBJ_GFX_BARD] = &gObjectEventGraphicsInfo_Bard, - [EVENT_OBJ_GFX_ANABEL] = &gObjectEventGraphicsInfo_Anabel, - [EVENT_OBJ_GFX_TUCKER] = &gObjectEventGraphicsInfo_Tucker, - [EVENT_OBJ_GFX_GRETA] = &gObjectEventGraphicsInfo_Greta, - [EVENT_OBJ_GFX_SPENSER] = &gObjectEventGraphicsInfo_Spenser, - [EVENT_OBJ_GFX_NOLAND] = &gObjectEventGraphicsInfo_Noland, - [EVENT_OBJ_GFX_LUCY] = &gObjectEventGraphicsInfo_Lucy, - [EVENT_OBJ_GFX_UNUSED_NATU_DOLL] = &gObjectEventGraphicsInfo_UnusedNatuDoll, - [EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL] = &gObjectEventGraphicsInfo_UnusedMagnemiteDoll, - [EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL] = &gObjectEventGraphicsInfo_UnusedSquirtleDoll, - [EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL] = &gObjectEventGraphicsInfo_UnusedWooperDoll, - [EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_UnusedPikachuDoll, - [EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL] = &gObjectEventGraphicsInfo_UnusedPorygon2Doll, - [EVENT_OBJ_GFX_CUTTABLE_TREE] = &gObjectEventGraphicsInfo_CuttableTree, - [EVENT_OBJ_GFX_MART_EMPLOYEE] = &gObjectEventGraphicsInfo_MartEmployee, - [EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN] = &gObjectEventGraphicsInfo_RooftopSaleWoman, - [EVENT_OBJ_GFX_TEALA] = &gObjectEventGraphicsInfo_Teala, - [EVENT_OBJ_GFX_BREAKABLE_ROCK] = &gObjectEventGraphicsInfo_BreakableRock, - [EVENT_OBJ_GFX_PUSHABLE_BOULDER] = &gObjectEventGraphicsInfo_PushableBoulder, - [EVENT_OBJ_GFX_MR_BRINEYS_BOAT] = &gObjectEventGraphicsInfo_MrBrineysBoat, - [EVENT_OBJ_GFX_MAY_NORMAL] = &gObjectEventGraphicsInfo_MayNormal, - [EVENT_OBJ_GFX_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_MayMachBike, - [EVENT_OBJ_GFX_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_MayAcroBike, - [EVENT_OBJ_GFX_MAY_SURFING] = &gObjectEventGraphicsInfo_MaySurfing, - [EVENT_OBJ_GFX_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_MayFieldMove, - [EVENT_OBJ_GFX_TRUCK] = &gObjectEventGraphicsInfo_Truck, - [EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX] = &gObjectEventGraphicsInfo_VigorothCarryingBox, - [EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY] = &gObjectEventGraphicsInfo_VigorothFacingAway, - [EVENT_OBJ_GFX_BIRCHS_BAG] = &gObjectEventGraphicsInfo_BirchsBag, - [EVENT_OBJ_GFX_ZIGZAGOON_1] = &gObjectEventGraphicsInfo_EnemyZigzagoon, - [EVENT_OBJ_GFX_ARTIST] = &gObjectEventGraphicsInfo_Artist, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_RivalBrendanNormal, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanMachBike, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanAcroBike, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_RivalBrendanSurfing, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalBrendanFieldMove, - [EVENT_OBJ_GFX_RIVAL_MAY_NORMAL] = &gObjectEventGraphicsInfo_RivalMayNormal, - [EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalMayMachBike, - [EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalMayAcroBike, - [EVENT_OBJ_GFX_RIVAL_MAY_SURFING] = &gObjectEventGraphicsInfo_RivalMaySurfing, - [EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalMayFieldMove, - [EVENT_OBJ_GFX_CAMERAMAN] = &gObjectEventGraphicsInfo_Cameraman, - [EVENT_OBJ_GFX_BRENDAN_UNDERWATER] = &gObjectEventGraphicsInfo_BrendanUnderwater, - [EVENT_OBJ_GFX_MAY_UNDERWATER] = &gObjectEventGraphicsInfo_MayUnderwater, - [EVENT_OBJ_GFX_MOVING_BOX] = &gObjectEventGraphicsInfo_MovingBox, - [EVENT_OBJ_GFX_CABLE_CAR] = &gObjectEventGraphicsInfo_CableCar, - [EVENT_OBJ_GFX_SCIENTIST_2] = &gObjectEventGraphicsInfo_Scientist2, - [EVENT_OBJ_GFX_DEVON_EMPLOYEE] = &gObjectEventGraphicsInfo_DevonEmployee, - [EVENT_OBJ_GFX_AQUA_MEMBER_M] = &gObjectEventGraphicsInfo_AquaMemberM, - [EVENT_OBJ_GFX_AQUA_MEMBER_F] = &gObjectEventGraphicsInfo_AquaMemberF, - [EVENT_OBJ_GFX_MAGMA_MEMBER_M] = &gObjectEventGraphicsInfo_MagmaMemberM, - [EVENT_OBJ_GFX_MAGMA_MEMBER_F] = &gObjectEventGraphicsInfo_MagmaMemberF, - [EVENT_OBJ_GFX_SIDNEY] = &gObjectEventGraphicsInfo_Sidney, - [EVENT_OBJ_GFX_PHOEBE] = &gObjectEventGraphicsInfo_Phoebe, - [EVENT_OBJ_GFX_GLACIA] = &gObjectEventGraphicsInfo_Glacia, - [EVENT_OBJ_GFX_DRAKE] = &gObjectEventGraphicsInfo_Drake, - [EVENT_OBJ_GFX_ROXANNE] = &gObjectEventGraphicsInfo_Roxanne, - [EVENT_OBJ_GFX_BRAWLY] = &gObjectEventGraphicsInfo_Brawly, - [EVENT_OBJ_GFX_WATTSON] = &gObjectEventGraphicsInfo_Wattson, - [EVENT_OBJ_GFX_FLANNERY] = &gObjectEventGraphicsInfo_Flannery, - [EVENT_OBJ_GFX_NORMAN] = &gObjectEventGraphicsInfo_Norman, - [EVENT_OBJ_GFX_WINONA] = &gObjectEventGraphicsInfo_Winona, - [EVENT_OBJ_GFX_LIZA] = &gObjectEventGraphicsInfo_Liza, - [EVENT_OBJ_GFX_TATE] = &gObjectEventGraphicsInfo_Tate, - [EVENT_OBJ_GFX_WALLACE] = &gObjectEventGraphicsInfo_Wallace, - [EVENT_OBJ_GFX_STEVEN] = &gObjectEventGraphicsInfo_Steven, - [EVENT_OBJ_GFX_WALLY] = &gObjectEventGraphicsInfo_Wally, - [EVENT_OBJ_GFX_LITTLE_BOY_3] = &gObjectEventGraphicsInfo_RubySapphireLittleBoy, - [EVENT_OBJ_GFX_BRENDAN_FISHING] = &gObjectEventGraphicsInfo_BrendanFishing, - [EVENT_OBJ_GFX_MAY_FISHING] = &gObjectEventGraphicsInfo_MayFishing, - [EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN] = &gObjectEventGraphicsInfo_HotSpringsOldWoman, - [EVENT_OBJ_GFX_SS_TIDAL] = &gObjectEventGraphicsInfo_SSTidal, - [EVENT_OBJ_GFX_SUBMARINE_SHADOW] = &gObjectEventGraphicsInfo_SubmarineShadow, - [EVENT_OBJ_GFX_PICHU_DOLL] = &gObjectEventGraphicsInfo_PichuDoll, - [EVENT_OBJ_GFX_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_PikachuDoll, - [EVENT_OBJ_GFX_MARILL_DOLL] = &gObjectEventGraphicsInfo_MarillDoll, - [EVENT_OBJ_GFX_TOGEPI_DOLL] = &gObjectEventGraphicsInfo_TogepiDoll, - [EVENT_OBJ_GFX_CYNDAQUIL_DOLL] = &gObjectEventGraphicsInfo_CyndaquilDoll, - [EVENT_OBJ_GFX_CHIKORITA_DOLL] = &gObjectEventGraphicsInfo_ChikoritaDoll, - [EVENT_OBJ_GFX_TOTODILE_DOLL] = &gObjectEventGraphicsInfo_TotodileDoll, - [EVENT_OBJ_GFX_JIGGLYPUFF_DOLL] = &gObjectEventGraphicsInfo_JigglypuffDoll, - [EVENT_OBJ_GFX_MEOWTH_DOLL] = &gObjectEventGraphicsInfo_MeowthDoll, - [EVENT_OBJ_GFX_CLEFAIRY_DOLL] = &gObjectEventGraphicsInfo_ClefairyDoll, - [EVENT_OBJ_GFX_DITTO_DOLL] = &gObjectEventGraphicsInfo_DittoDoll, - [EVENT_OBJ_GFX_SMOOCHUM_DOLL] = &gObjectEventGraphicsInfo_SmoochumDoll, - [EVENT_OBJ_GFX_TREECKO_DOLL] = &gObjectEventGraphicsInfo_TreeckoDoll, - [EVENT_OBJ_GFX_TORCHIC_DOLL] = &gObjectEventGraphicsInfo_TorchicDoll, - [EVENT_OBJ_GFX_MUDKIP_DOLL] = &gObjectEventGraphicsInfo_MudkipDoll, - [EVENT_OBJ_GFX_DUSKULL_DOLL] = &gObjectEventGraphicsInfo_DuskullDoll, - [EVENT_OBJ_GFX_WYNAUT_DOLL] = &gObjectEventGraphicsInfo_WynautDoll, - [EVENT_OBJ_GFX_BALTOY_DOLL] = &gObjectEventGraphicsInfo_BaltoyDoll, - [EVENT_OBJ_GFX_KECLEON_DOLL] = &gObjectEventGraphicsInfo_KecleonDoll, - [EVENT_OBJ_GFX_AZURILL_DOLL] = &gObjectEventGraphicsInfo_AzurillDoll, - [EVENT_OBJ_GFX_SKITTY_DOLL] = &gObjectEventGraphicsInfo_SkittyDoll, - [EVENT_OBJ_GFX_SWABLU_DOLL] = &gObjectEventGraphicsInfo_SwabluDoll, - [EVENT_OBJ_GFX_GULPIN_DOLL] = &gObjectEventGraphicsInfo_GulpinDoll, - [EVENT_OBJ_GFX_LOTAD_DOLL] = &gObjectEventGraphicsInfo_LotadDoll, - [EVENT_OBJ_GFX_SEEDOT_DOLL] = &gObjectEventGraphicsInfo_SeedotDoll, - [EVENT_OBJ_GFX_PIKA_CUSHION] = &gObjectEventGraphicsInfo_PikaCushion, - [EVENT_OBJ_GFX_ROUND_CUSHION] = &gObjectEventGraphicsInfo_RoundCushion, - [EVENT_OBJ_GFX_KISS_CUSHION] = &gObjectEventGraphicsInfo_KissCushion, - [EVENT_OBJ_GFX_ZIGZAG_CUSHION] = &gObjectEventGraphicsInfo_ZigzagCushion, - [EVENT_OBJ_GFX_SPIN_CUSHION] = &gObjectEventGraphicsInfo_SpinCushion, - [EVENT_OBJ_GFX_DIAMOND_CUSHION] = &gObjectEventGraphicsInfo_DiamondCushion, - [EVENT_OBJ_GFX_BALL_CUSHION] = &gObjectEventGraphicsInfo_BallCushion, - [EVENT_OBJ_GFX_GRASS_CUSHION] = &gObjectEventGraphicsInfo_GrassCushion, - [EVENT_OBJ_GFX_FIRE_CUSHION] = &gObjectEventGraphicsInfo_FireCushion, - [EVENT_OBJ_GFX_WATER_CUSHION] = &gObjectEventGraphicsInfo_WaterCushion, - [EVENT_OBJ_GFX_BIG_SNORLAX_DOLL] = &gObjectEventGraphicsInfo_BigSnorlaxDoll, - [EVENT_OBJ_GFX_BIG_RHYDON_DOLL] = &gObjectEventGraphicsInfo_BigRhydonDoll, - [EVENT_OBJ_GFX_BIG_LAPRAS_DOLL] = &gObjectEventGraphicsInfo_BigLaprasDoll, - [EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL] = &gObjectEventGraphicsInfo_BigVenusaurDoll, - [EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL] = &gObjectEventGraphicsInfo_BigCharizardDoll, - [EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL] = &gObjectEventGraphicsInfo_BigBlastoiseDoll, - [EVENT_OBJ_GFX_BIG_WAILMER_DOLL] = &gObjectEventGraphicsInfo_BigWailmerDoll, - [EVENT_OBJ_GFX_BIG_REGIROCK_DOLL] = &gObjectEventGraphicsInfo_BigRegirockDoll, - [EVENT_OBJ_GFX_BIG_REGICE_DOLL] = &gObjectEventGraphicsInfo_BigRegiceDoll, - [EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL] = &gObjectEventGraphicsInfo_BigRegisteelDoll, - [EVENT_OBJ_GFX_LATIAS] = &gObjectEventGraphicsInfo_Latias, - [EVENT_OBJ_GFX_LATIOS] = &gObjectEventGraphicsInfo_Latios, - [EVENT_OBJ_GFX_GAMEBOY_KID] = &gObjectEventGraphicsInfo_GameboyKid, - [EVENT_OBJ_GFX_CONTEST_JUDGE] = &gObjectEventGraphicsInfo_ContestJudge, - [EVENT_OBJ_GFX_BRENDAN_WATERING] = &gObjectEventGraphicsInfo_BrendanWatering, - [EVENT_OBJ_GFX_MAY_WATERING] = &gObjectEventGraphicsInfo_MayWatering, - [EVENT_OBJ_GFX_BRENDAN_DECORATING] = &gObjectEventGraphicsInfo_BrendanDecorating, - [EVENT_OBJ_GFX_MAY_DECORATING] = &gObjectEventGraphicsInfo_MayDecorating, - [EVENT_OBJ_GFX_ARCHIE] = &gObjectEventGraphicsInfo_Archie, - [EVENT_OBJ_GFX_MAXIE] = &gObjectEventGraphicsInfo_Maxie, - [EVENT_OBJ_GFX_KYOGRE_1] = &gObjectEventGraphicsInfo_Kyogre1, - [EVENT_OBJ_GFX_GROUDON_1] = &gObjectEventGraphicsInfo_Groudon1, - [EVENT_OBJ_GFX_FOSSIL] = &gObjectEventGraphicsInfo_Fossil, - [EVENT_OBJ_GFX_REGIROCK] = &gObjectEventGraphicsInfo_Regirock, - [EVENT_OBJ_GFX_REGICE] = &gObjectEventGraphicsInfo_Regice, - [EVENT_OBJ_GFX_REGISTEEL] = &gObjectEventGraphicsInfo_Registeel, - [EVENT_OBJ_GFX_SKITTY] = &gObjectEventGraphicsInfo_Skitty, - [EVENT_OBJ_GFX_KECLEON_1] = &gObjectEventGraphicsInfo_Kecleon1, - [EVENT_OBJ_GFX_KYOGRE_2] = &gObjectEventGraphicsInfo_Kyogre2, - [EVENT_OBJ_GFX_GROUDON_2] = &gObjectEventGraphicsInfo_Groudon2, - [EVENT_OBJ_GFX_RAYQUAZA_2] = &gObjectEventGraphicsInfo_Rayquaza2, - [EVENT_OBJ_GFX_ZIGZAGOON_2] = &gObjectEventGraphicsInfo_Zigzagoon, - [EVENT_OBJ_GFX_PIKACHU] = &gObjectEventGraphicsInfo_Pikachu, - [EVENT_OBJ_GFX_AZUMARILL] = &gObjectEventGraphicsInfo_Azumarill, - [EVENT_OBJ_GFX_WINGULL] = &gObjectEventGraphicsInfo_Wingull, - [EVENT_OBJ_GFX_KECLEON_2] = &gObjectEventGraphicsInfo_Kecleon2, - [EVENT_OBJ_GFX_TUBER_M_SWIMMING] = &gObjectEventGraphicsInfo_TuberMSwimming, - [EVENT_OBJ_GFX_AZURILL] = &gObjectEventGraphicsInfo_Azurill, - [EVENT_OBJ_GFX_MOM] = &gObjectEventGraphicsInfo_Mom, - [EVENT_OBJ_GFX_LINK_BRENDAN] = &gObjectEventGraphicsInfo_LinkBrendan, - [EVENT_OBJ_GFX_LINK_MAY] = &gObjectEventGraphicsInfo_LinkMay, - [EVENT_OBJ_GFX_JUAN] = &gObjectEventGraphicsInfo_Juan, - [EVENT_OBJ_GFX_SCOTT] = &gObjectEventGraphicsInfo_Scott, - [EVENT_OBJ_GFX_POOCHYENA] = &gObjectEventGraphicsInfo_Poochyena, - [EVENT_OBJ_GFX_KYOGRE_3] = &gObjectEventGraphicsInfo_Kyogre3, - [EVENT_OBJ_GFX_GROUDON_3] = &gObjectEventGraphicsInfo_Groudon3, - [EVENT_OBJ_GFX_MYSTERY_GIFT_MAN] = &gObjectEventGraphicsInfo_MysteryEventDeliveryman, - [EVENT_OBJ_GFX_TRICK_HOUSE_STATUE] = &gObjectEventGraphicsInfo_Statue, - [EVENT_OBJ_GFX_KIRLIA] = &gObjectEventGraphicsInfo_Kirlia, - [EVENT_OBJ_GFX_DUSCLOPS] = &gObjectEventGraphicsInfo_Dusclops, - [EVENT_OBJ_GFX_UNION_ROOM_NURSE] = &gObjectEventGraphicsInfo_UnionRoomAttendant, - [EVENT_OBJ_GFX_SUDOWOODO] = &gObjectEventGraphicsInfo_Sudowoodo, - [EVENT_OBJ_GFX_MEW] = &gObjectEventGraphicsInfo_Mew, - [EVENT_OBJ_GFX_RED] = &gObjectEventGraphicsInfo_Red, - [EVENT_OBJ_GFX_LEAF] = &gObjectEventGraphicsInfo_Leaf, - [EVENT_OBJ_GFX_DEOXYS] = &gObjectEventGraphicsInfo_Deoxys, - [EVENT_OBJ_GFX_DEOXYS_TRIANGLE] = &gObjectEventGraphicsInfo_BirthIslandStone, - [EVENT_OBJ_GFX_BRANDON] = &gObjectEventGraphicsInfo_Brandon, - [EVENT_OBJ_GFX_LINK_RS_BRENDAN] = &gObjectEventGraphicsInfo_RubySapphireBrendan, - [EVENT_OBJ_GFX_LINK_RS_MAY] = &gObjectEventGraphicsInfo_RubySapphireMay, - [EVENT_OBJ_GFX_LUGIA] = &gObjectEventGraphicsInfo_Lugia, - [EVENT_OBJ_GFX_HOOH] = &gObjectEventGraphicsInfo_HoOh, + [OBJ_EVENT_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal, + [OBJ_EVENT_GFX_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_BrendanMachBike, + [OBJ_EVENT_GFX_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_BrendanSurfing, + [OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_BrendanFieldMove, + [OBJ_EVENT_GFX_QUINTY_PLUMP] = &gObjectEventGraphicsInfo_QuintyPlump, + [OBJ_EVENT_GFX_NINJA_BOY] = &gObjectEventGraphicsInfo_NinjaBoy, + [OBJ_EVENT_GFX_TWIN] = &gObjectEventGraphicsInfo_Twin, + [OBJ_EVENT_GFX_BOY_1] = &gObjectEventGraphicsInfo_Boy1, + [OBJ_EVENT_GFX_GIRL_1] = &gObjectEventGraphicsInfo_Girl1, + [OBJ_EVENT_GFX_BOY_2] = &gObjectEventGraphicsInfo_Boy2, + [OBJ_EVENT_GFX_GIRL_2] = &gObjectEventGraphicsInfo_Girl2, + [OBJ_EVENT_GFX_LITTLE_BOY] = &gObjectEventGraphicsInfo_LittleBoy, + [OBJ_EVENT_GFX_LITTLE_GIRL] = &gObjectEventGraphicsInfo_LittleGirl, + [OBJ_EVENT_GFX_BOY_3] = &gObjectEventGraphicsInfo_Boy3, + [OBJ_EVENT_GFX_GIRL_3] = &gObjectEventGraphicsInfo_Girl3, + [OBJ_EVENT_GFX_RICH_BOY] = &gObjectEventGraphicsInfo_RichBoy, + [OBJ_EVENT_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1, + [OBJ_EVENT_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan, + [OBJ_EVENT_GFX_POKEFAN_F] = &gObjectEventGraphicsInfo_PokefanF, + [OBJ_EVENT_GFX_MAN_1] = &gObjectEventGraphicsInfo_Man1, + [OBJ_EVENT_GFX_WOMAN_2] = &gObjectEventGraphicsInfo_Woman2, + [OBJ_EVENT_GFX_EXPERT_M] = &gObjectEventGraphicsInfo_ExpertM, + [OBJ_EVENT_GFX_EXPERT_F] = &gObjectEventGraphicsInfo_ExpertF, + [OBJ_EVENT_GFX_MAN_2] = &gObjectEventGraphicsInfo_Man2, + [OBJ_EVENT_GFX_WOMAN_3] = &gObjectEventGraphicsInfo_Woman3, + [OBJ_EVENT_GFX_POKEFAN_M] = &gObjectEventGraphicsInfo_PokefanM, + [OBJ_EVENT_GFX_WOMAN_4] = &gObjectEventGraphicsInfo_Woman4, + [OBJ_EVENT_GFX_COOK] = &gObjectEventGraphicsInfo_Cook, + [OBJ_EVENT_GFX_LINK_RECEPTIONIST] = &gObjectEventGraphicsInfo_LinkReceptionist, + [OBJ_EVENT_GFX_OLD_MAN] = &gObjectEventGraphicsInfo_OldMan, + [OBJ_EVENT_GFX_OLD_WOMAN] = &gObjectEventGraphicsInfo_OldWoman, + [OBJ_EVENT_GFX_CAMPER] = &gObjectEventGraphicsInfo_Camper, + [OBJ_EVENT_GFX_PICNICKER] = &gObjectEventGraphicsInfo_Picnicker, + [OBJ_EVENT_GFX_MAN_3] = &gObjectEventGraphicsInfo_Man3, + [OBJ_EVENT_GFX_WOMAN_5] = &gObjectEventGraphicsInfo_Woman5, + [OBJ_EVENT_GFX_YOUNGSTER] = &gObjectEventGraphicsInfo_Youngster, + [OBJ_EVENT_GFX_BUG_CATCHER] = &gObjectEventGraphicsInfo_BugCatcher, + [OBJ_EVENT_GFX_PSYCHIC_M] = &gObjectEventGraphicsInfo_PsychicM, + [OBJ_EVENT_GFX_SCHOOL_KID_M] = &gObjectEventGraphicsInfo_SchoolKidM, + [OBJ_EVENT_GFX_MANIAC] = &gObjectEventGraphicsInfo_Maniac, + [OBJ_EVENT_GFX_HEX_MANIAC] = &gObjectEventGraphicsInfo_HexManiac, + [OBJ_EVENT_GFX_RAYQUAZA_1] = &gObjectEventGraphicsInfo_Rayquaza1, + [OBJ_EVENT_GFX_SWIMMER_M] = &gObjectEventGraphicsInfo_SwimmerM, + [OBJ_EVENT_GFX_SWIMMER_F] = &gObjectEventGraphicsInfo_SwimmerF, + [OBJ_EVENT_GFX_BLACK_BELT] = &gObjectEventGraphicsInfo_BlackBelt, + [OBJ_EVENT_GFX_BEAUTY] = &gObjectEventGraphicsInfo_Beauty, + [OBJ_EVENT_GFX_SCIENTIST_1] = &gObjectEventGraphicsInfo_Scientist1, + [OBJ_EVENT_GFX_LASS] = &gObjectEventGraphicsInfo_Lass, + [OBJ_EVENT_GFX_GENTLEMAN] = &gObjectEventGraphicsInfo_Gentleman, + [OBJ_EVENT_GFX_SAILOR] = &gObjectEventGraphicsInfo_Sailor, + [OBJ_EVENT_GFX_FISHERMAN] = &gObjectEventGraphicsInfo_Fisherman, + [OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_RunningTriathleteM, + [OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_RunningTriathleteF, + [OBJ_EVENT_GFX_TUBER_F] = &gObjectEventGraphicsInfo_TuberF, + [OBJ_EVENT_GFX_TUBER_M] = &gObjectEventGraphicsInfo_TuberM, + [OBJ_EVENT_GFX_HIKER] = &gObjectEventGraphicsInfo_Hiker, + [OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_CyclingTriathleteM, + [OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_CyclingTriathleteF, + [OBJ_EVENT_GFX_NURSE] = &gObjectEventGraphicsInfo_Nurse, + [OBJ_EVENT_GFX_ITEM_BALL] = &gObjectEventGraphicsInfo_ItemBall, + [OBJ_EVENT_GFX_BERRY_TREE] = &gObjectEventGraphicsInfo_BerryTree, + [OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES] = &gObjectEventGraphicsInfo_BerryTreeEarlyStages, + [OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES] = &gObjectEventGraphicsInfo_BerryTreeLateStages, + [OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_BrendanAcroBike, + [OBJ_EVENT_GFX_PROF_BIRCH] = &gObjectEventGraphicsInfo_ProfBirch, + [OBJ_EVENT_GFX_MAN_4] = &gObjectEventGraphicsInfo_Man4, + [OBJ_EVENT_GFX_MAN_5] = &gObjectEventGraphicsInfo_Man5, + [OBJ_EVENT_GFX_REPORTER_M] = &gObjectEventGraphicsInfo_ReporterM, + [OBJ_EVENT_GFX_REPORTER_F] = &gObjectEventGraphicsInfo_ReporterF, + [OBJ_EVENT_GFX_BARD] = &gObjectEventGraphicsInfo_Bard, + [OBJ_EVENT_GFX_ANABEL] = &gObjectEventGraphicsInfo_Anabel, + [OBJ_EVENT_GFX_TUCKER] = &gObjectEventGraphicsInfo_Tucker, + [OBJ_EVENT_GFX_GRETA] = &gObjectEventGraphicsInfo_Greta, + [OBJ_EVENT_GFX_SPENSER] = &gObjectEventGraphicsInfo_Spenser, + [OBJ_EVENT_GFX_NOLAND] = &gObjectEventGraphicsInfo_Noland, + [OBJ_EVENT_GFX_LUCY] = &gObjectEventGraphicsInfo_Lucy, + [OBJ_EVENT_GFX_UNUSED_NATU_DOLL] = &gObjectEventGraphicsInfo_UnusedNatuDoll, + [OBJ_EVENT_GFX_UNUSED_MAGNEMITE_DOLL] = &gObjectEventGraphicsInfo_UnusedMagnemiteDoll, + [OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL] = &gObjectEventGraphicsInfo_UnusedSquirtleDoll, + [OBJ_EVENT_GFX_UNUSED_WOOPER_DOLL] = &gObjectEventGraphicsInfo_UnusedWooperDoll, + [OBJ_EVENT_GFX_UNUSED_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_UnusedPikachuDoll, + [OBJ_EVENT_GFX_UNUSED_PORYGON2_DOLL] = &gObjectEventGraphicsInfo_UnusedPorygon2Doll, + [OBJ_EVENT_GFX_CUTTABLE_TREE] = &gObjectEventGraphicsInfo_CuttableTree, + [OBJ_EVENT_GFX_MART_EMPLOYEE] = &gObjectEventGraphicsInfo_MartEmployee, + [OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN] = &gObjectEventGraphicsInfo_RooftopSaleWoman, + [OBJ_EVENT_GFX_TEALA] = &gObjectEventGraphicsInfo_Teala, + [OBJ_EVENT_GFX_BREAKABLE_ROCK] = &gObjectEventGraphicsInfo_BreakableRock, + [OBJ_EVENT_GFX_PUSHABLE_BOULDER] = &gObjectEventGraphicsInfo_PushableBoulder, + [OBJ_EVENT_GFX_MR_BRINEYS_BOAT] = &gObjectEventGraphicsInfo_MrBrineysBoat, + [OBJ_EVENT_GFX_MAY_NORMAL] = &gObjectEventGraphicsInfo_MayNormal, + [OBJ_EVENT_GFX_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_MayMachBike, + [OBJ_EVENT_GFX_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_MayAcroBike, + [OBJ_EVENT_GFX_MAY_SURFING] = &gObjectEventGraphicsInfo_MaySurfing, + [OBJ_EVENT_GFX_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_MayFieldMove, + [OBJ_EVENT_GFX_TRUCK] = &gObjectEventGraphicsInfo_Truck, + [OBJ_EVENT_GFX_VIGOROTH_CARRYING_BOX] = &gObjectEventGraphicsInfo_VigorothCarryingBox, + [OBJ_EVENT_GFX_VIGOROTH_FACING_AWAY] = &gObjectEventGraphicsInfo_VigorothFacingAway, + [OBJ_EVENT_GFX_BIRCHS_BAG] = &gObjectEventGraphicsInfo_BirchsBag, + [OBJ_EVENT_GFX_ZIGZAGOON_1] = &gObjectEventGraphicsInfo_EnemyZigzagoon, + [OBJ_EVENT_GFX_ARTIST] = &gObjectEventGraphicsInfo_Artist, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_RivalBrendanNormal, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanMachBike, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanAcroBike, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_RivalBrendanSurfing, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalBrendanFieldMove, + [OBJ_EVENT_GFX_RIVAL_MAY_NORMAL] = &gObjectEventGraphicsInfo_RivalMayNormal, + [OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalMayMachBike, + [OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalMayAcroBike, + [OBJ_EVENT_GFX_RIVAL_MAY_SURFING] = &gObjectEventGraphicsInfo_RivalMaySurfing, + [OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalMayFieldMove, + [OBJ_EVENT_GFX_CAMERAMAN] = &gObjectEventGraphicsInfo_Cameraman, + [OBJ_EVENT_GFX_BRENDAN_UNDERWATER] = &gObjectEventGraphicsInfo_BrendanUnderwater, + [OBJ_EVENT_GFX_MAY_UNDERWATER] = &gObjectEventGraphicsInfo_MayUnderwater, + [OBJ_EVENT_GFX_MOVING_BOX] = &gObjectEventGraphicsInfo_MovingBox, + [OBJ_EVENT_GFX_CABLE_CAR] = &gObjectEventGraphicsInfo_CableCar, + [OBJ_EVENT_GFX_SCIENTIST_2] = &gObjectEventGraphicsInfo_Scientist2, + [OBJ_EVENT_GFX_DEVON_EMPLOYEE] = &gObjectEventGraphicsInfo_DevonEmployee, + [OBJ_EVENT_GFX_AQUA_MEMBER_M] = &gObjectEventGraphicsInfo_AquaMemberM, + [OBJ_EVENT_GFX_AQUA_MEMBER_F] = &gObjectEventGraphicsInfo_AquaMemberF, + [OBJ_EVENT_GFX_MAGMA_MEMBER_M] = &gObjectEventGraphicsInfo_MagmaMemberM, + [OBJ_EVENT_GFX_MAGMA_MEMBER_F] = &gObjectEventGraphicsInfo_MagmaMemberF, + [OBJ_EVENT_GFX_SIDNEY] = &gObjectEventGraphicsInfo_Sidney, + [OBJ_EVENT_GFX_PHOEBE] = &gObjectEventGraphicsInfo_Phoebe, + [OBJ_EVENT_GFX_GLACIA] = &gObjectEventGraphicsInfo_Glacia, + [OBJ_EVENT_GFX_DRAKE] = &gObjectEventGraphicsInfo_Drake, + [OBJ_EVENT_GFX_ROXANNE] = &gObjectEventGraphicsInfo_Roxanne, + [OBJ_EVENT_GFX_BRAWLY] = &gObjectEventGraphicsInfo_Brawly, + [OBJ_EVENT_GFX_WATTSON] = &gObjectEventGraphicsInfo_Wattson, + [OBJ_EVENT_GFX_FLANNERY] = &gObjectEventGraphicsInfo_Flannery, + [OBJ_EVENT_GFX_NORMAN] = &gObjectEventGraphicsInfo_Norman, + [OBJ_EVENT_GFX_WINONA] = &gObjectEventGraphicsInfo_Winona, + [OBJ_EVENT_GFX_LIZA] = &gObjectEventGraphicsInfo_Liza, + [OBJ_EVENT_GFX_TATE] = &gObjectEventGraphicsInfo_Tate, + [OBJ_EVENT_GFX_WALLACE] = &gObjectEventGraphicsInfo_Wallace, + [OBJ_EVENT_GFX_STEVEN] = &gObjectEventGraphicsInfo_Steven, + [OBJ_EVENT_GFX_WALLY] = &gObjectEventGraphicsInfo_Wally, + [OBJ_EVENT_GFX_LITTLE_BOY_3] = &gObjectEventGraphicsInfo_RubySapphireLittleBoy, + [OBJ_EVENT_GFX_BRENDAN_FISHING] = &gObjectEventGraphicsInfo_BrendanFishing, + [OBJ_EVENT_GFX_MAY_FISHING] = &gObjectEventGraphicsInfo_MayFishing, + [OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN] = &gObjectEventGraphicsInfo_HotSpringsOldWoman, + [OBJ_EVENT_GFX_SS_TIDAL] = &gObjectEventGraphicsInfo_SSTidal, + [OBJ_EVENT_GFX_SUBMARINE_SHADOW] = &gObjectEventGraphicsInfo_SubmarineShadow, + [OBJ_EVENT_GFX_PICHU_DOLL] = &gObjectEventGraphicsInfo_PichuDoll, + [OBJ_EVENT_GFX_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_PikachuDoll, + [OBJ_EVENT_GFX_MARILL_DOLL] = &gObjectEventGraphicsInfo_MarillDoll, + [OBJ_EVENT_GFX_TOGEPI_DOLL] = &gObjectEventGraphicsInfo_TogepiDoll, + [OBJ_EVENT_GFX_CYNDAQUIL_DOLL] = &gObjectEventGraphicsInfo_CyndaquilDoll, + [OBJ_EVENT_GFX_CHIKORITA_DOLL] = &gObjectEventGraphicsInfo_ChikoritaDoll, + [OBJ_EVENT_GFX_TOTODILE_DOLL] = &gObjectEventGraphicsInfo_TotodileDoll, + [OBJ_EVENT_GFX_JIGGLYPUFF_DOLL] = &gObjectEventGraphicsInfo_JigglypuffDoll, + [OBJ_EVENT_GFX_MEOWTH_DOLL] = &gObjectEventGraphicsInfo_MeowthDoll, + [OBJ_EVENT_GFX_CLEFAIRY_DOLL] = &gObjectEventGraphicsInfo_ClefairyDoll, + [OBJ_EVENT_GFX_DITTO_DOLL] = &gObjectEventGraphicsInfo_DittoDoll, + [OBJ_EVENT_GFX_SMOOCHUM_DOLL] = &gObjectEventGraphicsInfo_SmoochumDoll, + [OBJ_EVENT_GFX_TREECKO_DOLL] = &gObjectEventGraphicsInfo_TreeckoDoll, + [OBJ_EVENT_GFX_TORCHIC_DOLL] = &gObjectEventGraphicsInfo_TorchicDoll, + [OBJ_EVENT_GFX_MUDKIP_DOLL] = &gObjectEventGraphicsInfo_MudkipDoll, + [OBJ_EVENT_GFX_DUSKULL_DOLL] = &gObjectEventGraphicsInfo_DuskullDoll, + [OBJ_EVENT_GFX_WYNAUT_DOLL] = &gObjectEventGraphicsInfo_WynautDoll, + [OBJ_EVENT_GFX_BALTOY_DOLL] = &gObjectEventGraphicsInfo_BaltoyDoll, + [OBJ_EVENT_GFX_KECLEON_DOLL] = &gObjectEventGraphicsInfo_KecleonDoll, + [OBJ_EVENT_GFX_AZURILL_DOLL] = &gObjectEventGraphicsInfo_AzurillDoll, + [OBJ_EVENT_GFX_SKITTY_DOLL] = &gObjectEventGraphicsInfo_SkittyDoll, + [OBJ_EVENT_GFX_SWABLU_DOLL] = &gObjectEventGraphicsInfo_SwabluDoll, + [OBJ_EVENT_GFX_GULPIN_DOLL] = &gObjectEventGraphicsInfo_GulpinDoll, + [OBJ_EVENT_GFX_LOTAD_DOLL] = &gObjectEventGraphicsInfo_LotadDoll, + [OBJ_EVENT_GFX_SEEDOT_DOLL] = &gObjectEventGraphicsInfo_SeedotDoll, + [OBJ_EVENT_GFX_PIKA_CUSHION] = &gObjectEventGraphicsInfo_PikaCushion, + [OBJ_EVENT_GFX_ROUND_CUSHION] = &gObjectEventGraphicsInfo_RoundCushion, + [OBJ_EVENT_GFX_KISS_CUSHION] = &gObjectEventGraphicsInfo_KissCushion, + [OBJ_EVENT_GFX_ZIGZAG_CUSHION] = &gObjectEventGraphicsInfo_ZigzagCushion, + [OBJ_EVENT_GFX_SPIN_CUSHION] = &gObjectEventGraphicsInfo_SpinCushion, + [OBJ_EVENT_GFX_DIAMOND_CUSHION] = &gObjectEventGraphicsInfo_DiamondCushion, + [OBJ_EVENT_GFX_BALL_CUSHION] = &gObjectEventGraphicsInfo_BallCushion, + [OBJ_EVENT_GFX_GRASS_CUSHION] = &gObjectEventGraphicsInfo_GrassCushion, + [OBJ_EVENT_GFX_FIRE_CUSHION] = &gObjectEventGraphicsInfo_FireCushion, + [OBJ_EVENT_GFX_WATER_CUSHION] = &gObjectEventGraphicsInfo_WaterCushion, + [OBJ_EVENT_GFX_BIG_SNORLAX_DOLL] = &gObjectEventGraphicsInfo_BigSnorlaxDoll, + [OBJ_EVENT_GFX_BIG_RHYDON_DOLL] = &gObjectEventGraphicsInfo_BigRhydonDoll, + [OBJ_EVENT_GFX_BIG_LAPRAS_DOLL] = &gObjectEventGraphicsInfo_BigLaprasDoll, + [OBJ_EVENT_GFX_BIG_VENUSAUR_DOLL] = &gObjectEventGraphicsInfo_BigVenusaurDoll, + [OBJ_EVENT_GFX_BIG_CHARIZARD_DOLL] = &gObjectEventGraphicsInfo_BigCharizardDoll, + [OBJ_EVENT_GFX_BIG_BLASTOISE_DOLL] = &gObjectEventGraphicsInfo_BigBlastoiseDoll, + [OBJ_EVENT_GFX_BIG_WAILMER_DOLL] = &gObjectEventGraphicsInfo_BigWailmerDoll, + [OBJ_EVENT_GFX_BIG_REGIROCK_DOLL] = &gObjectEventGraphicsInfo_BigRegirockDoll, + [OBJ_EVENT_GFX_BIG_REGICE_DOLL] = &gObjectEventGraphicsInfo_BigRegiceDoll, + [OBJ_EVENT_GFX_BIG_REGISTEEL_DOLL] = &gObjectEventGraphicsInfo_BigRegisteelDoll, + [OBJ_EVENT_GFX_LATIAS] = &gObjectEventGraphicsInfo_Latias, + [OBJ_EVENT_GFX_LATIOS] = &gObjectEventGraphicsInfo_Latios, + [OBJ_EVENT_GFX_GAMEBOY_KID] = &gObjectEventGraphicsInfo_GameboyKid, + [OBJ_EVENT_GFX_CONTEST_JUDGE] = &gObjectEventGraphicsInfo_ContestJudge, + [OBJ_EVENT_GFX_BRENDAN_WATERING] = &gObjectEventGraphicsInfo_BrendanWatering, + [OBJ_EVENT_GFX_MAY_WATERING] = &gObjectEventGraphicsInfo_MayWatering, + [OBJ_EVENT_GFX_BRENDAN_DECORATING] = &gObjectEventGraphicsInfo_BrendanDecorating, + [OBJ_EVENT_GFX_MAY_DECORATING] = &gObjectEventGraphicsInfo_MayDecorating, + [OBJ_EVENT_GFX_ARCHIE] = &gObjectEventGraphicsInfo_Archie, + [OBJ_EVENT_GFX_MAXIE] = &gObjectEventGraphicsInfo_Maxie, + [OBJ_EVENT_GFX_KYOGRE_1] = &gObjectEventGraphicsInfo_Kyogre1, + [OBJ_EVENT_GFX_GROUDON_1] = &gObjectEventGraphicsInfo_Groudon1, + [OBJ_EVENT_GFX_FOSSIL] = &gObjectEventGraphicsInfo_Fossil, + [OBJ_EVENT_GFX_REGIROCK] = &gObjectEventGraphicsInfo_Regirock, + [OBJ_EVENT_GFX_REGICE] = &gObjectEventGraphicsInfo_Regice, + [OBJ_EVENT_GFX_REGISTEEL] = &gObjectEventGraphicsInfo_Registeel, + [OBJ_EVENT_GFX_SKITTY] = &gObjectEventGraphicsInfo_Skitty, + [OBJ_EVENT_GFX_KECLEON_1] = &gObjectEventGraphicsInfo_Kecleon1, + [OBJ_EVENT_GFX_KYOGRE_2] = &gObjectEventGraphicsInfo_Kyogre2, + [OBJ_EVENT_GFX_GROUDON_2] = &gObjectEventGraphicsInfo_Groudon2, + [OBJ_EVENT_GFX_RAYQUAZA_2] = &gObjectEventGraphicsInfo_Rayquaza2, + [OBJ_EVENT_GFX_ZIGZAGOON_2] = &gObjectEventGraphicsInfo_Zigzagoon, + [OBJ_EVENT_GFX_PIKACHU] = &gObjectEventGraphicsInfo_Pikachu, + [OBJ_EVENT_GFX_AZUMARILL] = &gObjectEventGraphicsInfo_Azumarill, + [OBJ_EVENT_GFX_WINGULL] = &gObjectEventGraphicsInfo_Wingull, + [OBJ_EVENT_GFX_KECLEON_2] = &gObjectEventGraphicsInfo_Kecleon2, + [OBJ_EVENT_GFX_TUBER_M_SWIMMING] = &gObjectEventGraphicsInfo_TuberMSwimming, + [OBJ_EVENT_GFX_AZURILL] = &gObjectEventGraphicsInfo_Azurill, + [OBJ_EVENT_GFX_MOM] = &gObjectEventGraphicsInfo_Mom, + [OBJ_EVENT_GFX_LINK_BRENDAN] = &gObjectEventGraphicsInfo_LinkBrendan, + [OBJ_EVENT_GFX_LINK_MAY] = &gObjectEventGraphicsInfo_LinkMay, + [OBJ_EVENT_GFX_JUAN] = &gObjectEventGraphicsInfo_Juan, + [OBJ_EVENT_GFX_SCOTT] = &gObjectEventGraphicsInfo_Scott, + [OBJ_EVENT_GFX_POOCHYENA] = &gObjectEventGraphicsInfo_Poochyena, + [OBJ_EVENT_GFX_KYOGRE_3] = &gObjectEventGraphicsInfo_Kyogre3, + [OBJ_EVENT_GFX_GROUDON_3] = &gObjectEventGraphicsInfo_Groudon3, + [OBJ_EVENT_GFX_MYSTERY_GIFT_MAN] = &gObjectEventGraphicsInfo_MysteryEventDeliveryman, + [OBJ_EVENT_GFX_TRICK_HOUSE_STATUE] = &gObjectEventGraphicsInfo_Statue, + [OBJ_EVENT_GFX_KIRLIA] = &gObjectEventGraphicsInfo_Kirlia, + [OBJ_EVENT_GFX_DUSCLOPS] = &gObjectEventGraphicsInfo_Dusclops, + [OBJ_EVENT_GFX_UNION_ROOM_NURSE] = &gObjectEventGraphicsInfo_UnionRoomAttendant, + [OBJ_EVENT_GFX_SUDOWOODO] = &gObjectEventGraphicsInfo_Sudowoodo, + [OBJ_EVENT_GFX_MEW] = &gObjectEventGraphicsInfo_Mew, + [OBJ_EVENT_GFX_RED] = &gObjectEventGraphicsInfo_Red, + [OBJ_EVENT_GFX_LEAF] = &gObjectEventGraphicsInfo_Leaf, + [OBJ_EVENT_GFX_DEOXYS] = &gObjectEventGraphicsInfo_Deoxys, + [OBJ_EVENT_GFX_DEOXYS_TRIANGLE] = &gObjectEventGraphicsInfo_BirthIslandStone, + [OBJ_EVENT_GFX_BRANDON] = &gObjectEventGraphicsInfo_Brandon, + [OBJ_EVENT_GFX_LINK_RS_BRENDAN] = &gObjectEventGraphicsInfo_RubySapphireBrendan, + [OBJ_EVENT_GFX_LINK_RS_MAY] = &gObjectEventGraphicsInfo_RubySapphireMay, + [OBJ_EVENT_GFX_LUGIA] = &gObjectEventGraphicsInfo_Lugia, + [OBJ_EVENT_GFX_HOOH] = &gObjectEventGraphicsInfo_HoOh, }; const struct ObjectEventGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { diff --git a/src/data/lilycove_lady.h b/src/data/lilycove_lady.h index f60e527a5b..738a6dc120 100644 --- a/src/data/lilycove_lady.h +++ b/src/data/lilycove_lady.h @@ -6,18 +6,18 @@ static const u16 sContestLadyMonGfxId[] = { - EVENT_OBJ_GFX_ZIGZAGOON_1, - EVENT_OBJ_GFX_SKITTY, - EVENT_OBJ_GFX_POOCHYENA, - EVENT_OBJ_GFX_KECLEON_1, - EVENT_OBJ_GFX_PIKACHU + OBJ_EVENT_GFX_ZIGZAGOON_1, + OBJ_EVENT_GFX_SKITTY, + OBJ_EVENT_GFX_POOCHYENA, + OBJ_EVENT_GFX_KECLEON_1, + OBJ_EVENT_GFX_PIKACHU }; static const u16 sLilycoveLadyGfxId[] = { - EVENT_OBJ_GFX_WOMAN_4, - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_GIRL_2 + OBJ_EVENT_GFX_WOMAN_4, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_GIRL_2 }; // Quiz Lady data diff --git a/src/decoration.c b/src/decoration.c index 731691a057..a0065752ab 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1253,7 +1253,7 @@ void SetDecoration(void) } VarSet( - VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[j].graphicsId - EVENT_OBJ_GFX_VAR_0), + VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[j].graphicsId - OBJ_EVENT_GFX_VAR_0), sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); gSpecialVar_0x8005 = gMapHeader.events->objectEvents[j].localId; @@ -1365,9 +1365,9 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct PlaceDecorationGraphic x -= 8; if (gSaveBlock2Ptr->playerGender == MALE) - sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(OBJ_EVENT_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0); else - sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(OBJ_EVENT_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0); gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); @@ -2250,9 +2250,9 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void) sub_812A39C(); gFieldCamera.spriteId = CreateSprite(&gUnknown_085A7404, 120, 80, 0); if (gSaveBlock2Ptr->playerGender == MALE) - sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(OBJ_EVENT_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0); else - sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(OBJ_EVENT_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0); gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); diff --git a/src/easy_chat.c b/src/easy_chat.c index 59628ddace..a2d03d8d6b 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -4718,13 +4718,13 @@ static void sub_811E828(void) switch (GetDisplayedPersonType()) { case EASY_CHAT_PERSON_REPORTER_MALE: - graphicsId = EVENT_OBJ_GFX_REPORTER_M; + graphicsId = OBJ_EVENT_GFX_REPORTER_M; break; case EASY_CHAT_PERSON_REPORTER_FEMALE: - graphicsId = EVENT_OBJ_GFX_REPORTER_F; + graphicsId = OBJ_EVENT_GFX_REPORTER_F; break; case EASY_CHAT_PERSON_BOY: - graphicsId = EVENT_OBJ_GFX_BOY_1; + graphicsId = OBJ_EVENT_GFX_BOY_1; break; default: return; @@ -4741,7 +4741,7 @@ static void sub_811E828(void) } spriteId = AddPseudoObjectEvent( - gSaveBlock2Ptr->playerGender == MALE ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, + gSaveBlock2Ptr->playerGender == MALE ? OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL : OBJ_EVENT_GFX_RIVAL_MAY_NORMAL, SpriteCallbackDummy, 52, 40, diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c index 4b0ee9f701..ce808fc2aa 100644 --- a/src/event_obj_lock.c +++ b/src/event_obj_lock.c @@ -90,7 +90,7 @@ void LockSelectedObjectEvent(void) void ScriptUnfreezeObjectEvents(void) { - u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); @@ -102,7 +102,7 @@ void sub_8098524(void) if (gObjectEvents[gSelectedObjectEvent].active) ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); - playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 1a6cc6c0d9..e32af3e1e9 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -396,42 +396,42 @@ const u8 gInitialMovementTypeFacingDirections[] = { [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_EAST, }; -#define EVENT_OBJ_PAL_TAG_0 0x1103 -#define EVENT_OBJ_PAL_TAG_1 0x1104 -#define EVENT_OBJ_PAL_TAG_2 0x1105 -#define EVENT_OBJ_PAL_TAG_3 0x1106 -#define EVENT_OBJ_PAL_TAG_4 0x1107 -#define EVENT_OBJ_PAL_TAG_5 0x1108 -#define EVENT_OBJ_PAL_TAG_6 0x1109 -#define EVENT_OBJ_PAL_TAG_7 0x110A -#define EVENT_OBJ_PAL_TAG_8 0x1100 -#define EVENT_OBJ_PAL_TAG_9 0x1101 -#define EVENT_OBJ_PAL_TAG_10 0x1102 -#define EVENT_OBJ_PAL_TAG_11 0x1115 -#define EVENT_OBJ_PAL_TAG_12 0x110B -#define EVENT_OBJ_PAL_TAG_13 0x110C -#define EVENT_OBJ_PAL_TAG_14 0x110D -#define EVENT_OBJ_PAL_TAG_15 0x110E -#define EVENT_OBJ_PAL_TAG_16 0x110F -#define EVENT_OBJ_PAL_TAG_17 0x1110 -#define EVENT_OBJ_PAL_TAG_18 0x1111 -#define EVENT_OBJ_PAL_TAG_19 0x1112 -#define EVENT_OBJ_PAL_TAG_20 0x1113 -#define EVENT_OBJ_PAL_TAG_21 0x1114 -#define EVENT_OBJ_PAL_TAG_22 0x1116 -#define EVENT_OBJ_PAL_TAG_23 0x1117 -#define EVENT_OBJ_PAL_TAG_24 0x1118 -#define EVENT_OBJ_PAL_TAG_25 0x1119 -#define EVENT_OBJ_PAL_TAG_26 0x111B -#define EVENT_OBJ_PAL_TAG_27 0x111C -#define EVENT_OBJ_PAL_TAG_28 0x111D -#define EVENT_OBJ_PAL_TAG_29 0x111E -#define EVENT_OBJ_PAL_TAG_30 0x111F -#define EVENT_OBJ_PAL_TAG_31 0x1120 -#define EVENT_OBJ_PAL_TAG_32 0x1121 -#define EVENT_OBJ_PAL_TAG_33 0x1122 -#define EVENT_OBJ_PAL_TAG_34 0x1123 -#define EVENT_OBJ_PAL_TAG_NONE 0x11FF +#define OBJ_EVENT_PAL_TAG_0 0x1103 +#define OBJ_EVENT_PAL_TAG_1 0x1104 +#define OBJ_EVENT_PAL_TAG_2 0x1105 +#define OBJ_EVENT_PAL_TAG_3 0x1106 +#define OBJ_EVENT_PAL_TAG_4 0x1107 +#define OBJ_EVENT_PAL_TAG_5 0x1108 +#define OBJ_EVENT_PAL_TAG_6 0x1109 +#define OBJ_EVENT_PAL_TAG_7 0x110A +#define OBJ_EVENT_PAL_TAG_8 0x1100 +#define OBJ_EVENT_PAL_TAG_9 0x1101 +#define OBJ_EVENT_PAL_TAG_10 0x1102 +#define OBJ_EVENT_PAL_TAG_11 0x1115 +#define OBJ_EVENT_PAL_TAG_12 0x110B +#define OBJ_EVENT_PAL_TAG_13 0x110C +#define OBJ_EVENT_PAL_TAG_14 0x110D +#define OBJ_EVENT_PAL_TAG_15 0x110E +#define OBJ_EVENT_PAL_TAG_16 0x110F +#define OBJ_EVENT_PAL_TAG_17 0x1110 +#define OBJ_EVENT_PAL_TAG_18 0x1111 +#define OBJ_EVENT_PAL_TAG_19 0x1112 +#define OBJ_EVENT_PAL_TAG_20 0x1113 +#define OBJ_EVENT_PAL_TAG_21 0x1114 +#define OBJ_EVENT_PAL_TAG_22 0x1116 +#define OBJ_EVENT_PAL_TAG_23 0x1117 +#define OBJ_EVENT_PAL_TAG_24 0x1118 +#define OBJ_EVENT_PAL_TAG_25 0x1119 +#define OBJ_EVENT_PAL_TAG_26 0x111B +#define OBJ_EVENT_PAL_TAG_27 0x111C +#define OBJ_EVENT_PAL_TAG_28 0x111D +#define OBJ_EVENT_PAL_TAG_29 0x111E +#define OBJ_EVENT_PAL_TAG_30 0x111F +#define OBJ_EVENT_PAL_TAG_31 0x1120 +#define OBJ_EVENT_PAL_TAG_32 0x1121 +#define OBJ_EVENT_PAL_TAG_33 0x1122 +#define OBJ_EVENT_PAL_TAG_34 0x1123 +#define OBJ_EVENT_PAL_TAG_NONE 0x11FF #include "data/event_object/event_object_graphics_info_pointers.h" #include "data/event_object/field_effect_object_template_pointers.h" @@ -442,216 +442,216 @@ const u8 gInitialMovementTypeFacingDirections[] = { #include "data/event_object/event_object_graphics_info.h" const struct SpritePalette sObjectEventSpritePalettes[] = { - {gObjectEventPalette0, EVENT_OBJ_PAL_TAG_0}, - {gObjectEventPalette1, EVENT_OBJ_PAL_TAG_1}, - {gObjectEventPalette2, EVENT_OBJ_PAL_TAG_2}, - {gObjectEventPalette3, EVENT_OBJ_PAL_TAG_3}, - {gObjectEventPalette4, EVENT_OBJ_PAL_TAG_4}, - {gObjectEventPalette5, EVENT_OBJ_PAL_TAG_5}, - {gObjectEventPalette6, EVENT_OBJ_PAL_TAG_6}, - {gObjectEventPalette7, EVENT_OBJ_PAL_TAG_7}, - {gObjectEventPalette8, EVENT_OBJ_PAL_TAG_8}, - {gObjectEventPalette9, EVENT_OBJ_PAL_TAG_9}, - {gObjectEventPalette10, EVENT_OBJ_PAL_TAG_10}, - {gObjectEventPalette11, EVENT_OBJ_PAL_TAG_11}, - {gObjectEventPalette12, EVENT_OBJ_PAL_TAG_12}, - {gObjectEventPalette13, EVENT_OBJ_PAL_TAG_13}, - {gObjectEventPalette14, EVENT_OBJ_PAL_TAG_14}, - {gObjectEventPalette15, EVENT_OBJ_PAL_TAG_15}, - {gObjectEventPalette16, EVENT_OBJ_PAL_TAG_16}, - {gObjectEventPalette17, EVENT_OBJ_PAL_TAG_17}, - {gObjectEventPalette18, EVENT_OBJ_PAL_TAG_18}, - {gObjectEventPalette19, EVENT_OBJ_PAL_TAG_19}, - {gObjectEventPalette20, EVENT_OBJ_PAL_TAG_20}, - {gObjectEventPalette21, EVENT_OBJ_PAL_TAG_21}, - {gObjectEventPalette22, EVENT_OBJ_PAL_TAG_22}, - {gObjectEventPalette23, EVENT_OBJ_PAL_TAG_23}, - {gObjectEventPalette24, EVENT_OBJ_PAL_TAG_24}, - {gObjectEventPalette25, EVENT_OBJ_PAL_TAG_25}, - {gObjectEventPalette26, EVENT_OBJ_PAL_TAG_26}, - {gObjectEventPalette27, EVENT_OBJ_PAL_TAG_27}, - {gObjectEventPalette28, EVENT_OBJ_PAL_TAG_28}, - {gObjectEventPalette29, EVENT_OBJ_PAL_TAG_29}, - {gObjectEventPalette30, EVENT_OBJ_PAL_TAG_30}, - {gObjectEventPalette31, EVENT_OBJ_PAL_TAG_31}, - {gObjectEventPalette32, EVENT_OBJ_PAL_TAG_32}, - {gObjectEventPalette33, EVENT_OBJ_PAL_TAG_33}, - {gObjectEventPalette34, EVENT_OBJ_PAL_TAG_34}, + {gObjectEventPalette0, OBJ_EVENT_PAL_TAG_0}, + {gObjectEventPalette1, OBJ_EVENT_PAL_TAG_1}, + {gObjectEventPalette2, OBJ_EVENT_PAL_TAG_2}, + {gObjectEventPalette3, OBJ_EVENT_PAL_TAG_3}, + {gObjectEventPalette4, OBJ_EVENT_PAL_TAG_4}, + {gObjectEventPalette5, OBJ_EVENT_PAL_TAG_5}, + {gObjectEventPalette6, OBJ_EVENT_PAL_TAG_6}, + {gObjectEventPalette7, OBJ_EVENT_PAL_TAG_7}, + {gObjectEventPalette8, OBJ_EVENT_PAL_TAG_8}, + {gObjectEventPalette9, OBJ_EVENT_PAL_TAG_9}, + {gObjectEventPalette10, OBJ_EVENT_PAL_TAG_10}, + {gObjectEventPalette11, OBJ_EVENT_PAL_TAG_11}, + {gObjectEventPalette12, OBJ_EVENT_PAL_TAG_12}, + {gObjectEventPalette13, OBJ_EVENT_PAL_TAG_13}, + {gObjectEventPalette14, OBJ_EVENT_PAL_TAG_14}, + {gObjectEventPalette15, OBJ_EVENT_PAL_TAG_15}, + {gObjectEventPalette16, OBJ_EVENT_PAL_TAG_16}, + {gObjectEventPalette17, OBJ_EVENT_PAL_TAG_17}, + {gObjectEventPalette18, OBJ_EVENT_PAL_TAG_18}, + {gObjectEventPalette19, OBJ_EVENT_PAL_TAG_19}, + {gObjectEventPalette20, OBJ_EVENT_PAL_TAG_20}, + {gObjectEventPalette21, OBJ_EVENT_PAL_TAG_21}, + {gObjectEventPalette22, OBJ_EVENT_PAL_TAG_22}, + {gObjectEventPalette23, OBJ_EVENT_PAL_TAG_23}, + {gObjectEventPalette24, OBJ_EVENT_PAL_TAG_24}, + {gObjectEventPalette25, OBJ_EVENT_PAL_TAG_25}, + {gObjectEventPalette26, OBJ_EVENT_PAL_TAG_26}, + {gObjectEventPalette27, OBJ_EVENT_PAL_TAG_27}, + {gObjectEventPalette28, OBJ_EVENT_PAL_TAG_28}, + {gObjectEventPalette29, OBJ_EVENT_PAL_TAG_29}, + {gObjectEventPalette30, OBJ_EVENT_PAL_TAG_30}, + {gObjectEventPalette31, OBJ_EVENT_PAL_TAG_31}, + {gObjectEventPalette32, OBJ_EVENT_PAL_TAG_32}, + {gObjectEventPalette33, OBJ_EVENT_PAL_TAG_33}, + {gObjectEventPalette34, OBJ_EVENT_PAL_TAG_34}, {NULL, 0x0000}, }; const u16 gPlayerReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, }; const u16 Unknown_0850BCF0[] = { - EVENT_OBJ_PAL_TAG_18, - EVENT_OBJ_PAL_TAG_18, - EVENT_OBJ_PAL_TAG_18, - EVENT_OBJ_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, }; const u16 gPlayerUnderwaterReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_11, - EVENT_OBJ_PAL_TAG_11, - EVENT_OBJ_PAL_TAG_11, - EVENT_OBJ_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, }; const struct PairedPalettes gPlayerReflectionPaletteSets[] = { - {EVENT_OBJ_PAL_TAG_8, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_17, Unknown_0850BCF0}, - {EVENT_OBJ_PAL_TAG_11, gPlayerUnderwaterReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_NONE, NULL}, + {OBJ_EVENT_PAL_TAG_8, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_17, Unknown_0850BCF0}, + {OBJ_EVENT_PAL_TAG_11, gPlayerUnderwaterReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; const u16 gQuintyPlumpReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_13, - EVENT_OBJ_PAL_TAG_13, - EVENT_OBJ_PAL_TAG_13, - EVENT_OBJ_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, }; const u16 gTruckReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_14, - EVENT_OBJ_PAL_TAG_14, - EVENT_OBJ_PAL_TAG_14, - EVENT_OBJ_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, }; const u16 gVigorothMoverReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_15, - EVENT_OBJ_PAL_TAG_15, - EVENT_OBJ_PAL_TAG_15, - EVENT_OBJ_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, }; const u16 gMovingBoxReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_19, - EVENT_OBJ_PAL_TAG_19, - EVENT_OBJ_PAL_TAG_19, - EVENT_OBJ_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, }; const u16 gCableCarReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_20, - EVENT_OBJ_PAL_TAG_20, - EVENT_OBJ_PAL_TAG_20, - EVENT_OBJ_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, }; const u16 gSSTidalReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_21, - EVENT_OBJ_PAL_TAG_21, - EVENT_OBJ_PAL_TAG_21, - EVENT_OBJ_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, }; const u16 gSubmarineShadowReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_26, - EVENT_OBJ_PAL_TAG_26, - EVENT_OBJ_PAL_TAG_26, - EVENT_OBJ_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, }; const u16 Unknown_0850BD58[] = { // Kyogre2? - EVENT_OBJ_PAL_TAG_23, - EVENT_OBJ_PAL_TAG_23, - EVENT_OBJ_PAL_TAG_23, - EVENT_OBJ_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, }; const u16 Unknown_0850BD60[] = { // Groudon2? - EVENT_OBJ_PAL_TAG_25, - EVENT_OBJ_PAL_TAG_25, - EVENT_OBJ_PAL_TAG_25, - EVENT_OBJ_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, }; const u16 Unknown_0850BD68[] = { // Invisible Keckleon? - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, }; const u16 gRedLeafReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_28, - EVENT_OBJ_PAL_TAG_28, - EVENT_OBJ_PAL_TAG_28, - EVENT_OBJ_PAL_TAG_28, + OBJ_EVENT_PAL_TAG_28, + OBJ_EVENT_PAL_TAG_28, + OBJ_EVENT_PAL_TAG_28, + OBJ_EVENT_PAL_TAG_28, }; const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = { - {EVENT_OBJ_PAL_TAG_8, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_17, Unknown_0850BCF0}, - {EVENT_OBJ_PAL_TAG_12, gQuintyPlumpReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_14, gTruckReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_15, gVigorothMoverReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_19, gMovingBoxReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_20, gCableCarReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_21, gSSTidalReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_22, Unknown_0850BD58}, - {EVENT_OBJ_PAL_TAG_24, Unknown_0850BD60}, - {EVENT_OBJ_PAL_TAG_2, Unknown_0850BD68}, - {EVENT_OBJ_PAL_TAG_26, gSubmarineShadowReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_28, gRedLeafReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_NONE, NULL}, + {OBJ_EVENT_PAL_TAG_8, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_17, Unknown_0850BCF0}, + {OBJ_EVENT_PAL_TAG_12, gQuintyPlumpReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_14, gTruckReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_15, gVigorothMoverReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_19, gMovingBoxReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_20, gCableCarReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_21, gSSTidalReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_22, Unknown_0850BD58}, + {OBJ_EVENT_PAL_TAG_24, Unknown_0850BD60}, + {OBJ_EVENT_PAL_TAG_2, Unknown_0850BD68}, + {OBJ_EVENT_PAL_TAG_26, gSubmarineShadowReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_28, gRedLeafReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; const u16 gObjectPaletteTags0[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 gObjectPaletteTags1[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 gObjectPaletteTags2[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 gObjectPaletteTags3[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 *const gObjectPaletteTagSets[] = { @@ -1106,7 +1106,7 @@ static void ClearAllObjectEvents(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) ClearObjectEvent(&gObjectEvents[i]); } @@ -1136,7 +1136,7 @@ static void CreateReflectionEffectSprites(void) u8 GetFirstInactiveObjectEventId(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (!gObjectEvents[i].active) break; @@ -1147,7 +1147,7 @@ u8 GetFirstInactiveObjectEventId(void) u8 GetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) { - if (localId < EVENT_OBJ_ID_PLAYER) + if (localId < OBJ_EVENT_ID_PLAYER) { return GetObjectEventIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); } @@ -1157,7 +1157,7 @@ u8 GetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) bool8 TryGetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId, u8 *objectEventId) { *objectEventId = GetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroupId); - if (*objectEventId == EVENT_OBJECTS_COUNT) + if (*objectEventId == OBJECT_EVENTS_COUNT) return TRUE; else return FALSE; @@ -1166,7 +1166,7 @@ bool8 TryGetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId, u u8 GetObjectEventIdByXY(s16 x, s16 y) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (gObjectEvents[i].active && gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y) break; @@ -1178,25 +1178,25 @@ u8 GetObjectEventIdByXY(s16 x, s16 y) static u8 GetObjectEventIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroupId) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroupId) return i; } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } static u8 GetObjectEventIdByLocalId(u8 localId) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (gObjectEvents[i].active && gObjectEvents[i].localId == localId) return i; } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } // This function has the same nonmatching quirk as in Ruby/Sapphire. @@ -1211,7 +1211,7 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, // mapNum and mapGroup are in the wrong registers (r7/r6 instead of r6/r7) if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId)) { - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } objectEvent = &gObjectEvents[objectEventId]; ClearObjectEvent(objectEvent); @@ -1441,7 +1441,7 @@ u8 Unref_TryInitLocalObjectEvent(u8 localId) } } } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 *objectEventId) @@ -1453,14 +1453,14 @@ static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 * { u8 i = 0; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (!gObjectEvents[i].active) break; if (gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; } - if (i >= EVENT_OBJECTS_COUNT) + if (i >= OBJECT_EVENTS_COUNT) return TRUE; *objectEventId = i; do @@ -1468,7 +1468,7 @@ static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 * if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; i++; - } while (i < EVENT_OBJECTS_COUNT); + } while (i < OBJECT_EVENTS_COUNT); return FALSE; } @@ -1500,7 +1500,7 @@ void RemoveAllObjectEventsExceptPlayer(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (i != gPlayerAvatar.objectEventId) RemoveObjectEvent(&gObjectEvents[i]); @@ -1517,8 +1517,8 @@ static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTempl const struct ObjectEventGraphicsInfo *graphicsInfo; objectEventId = InitObjectEventStateFromTemplate(objectEventTemplate, mapNum, mapGroup); - if (objectEventId == EVENT_OBJECTS_COUNT) - return EVENT_OBJECTS_COUNT; + if (objectEventId == OBJECT_EVENTS_COUNT) + return OBJECT_EVENTS_COUNT; objectEvent = &gObjectEvents[objectEventId]; graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); @@ -1545,7 +1545,7 @@ static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTempl if (spriteId == MAX_SPRITES) { gObjectEvents[objectEventId].active = FALSE; - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } sprite = &gSprites[spriteId]; @@ -1580,8 +1580,8 @@ static u8 TrySpawnObjectEventTemplate(struct ObjectEventTemplate *objectEventTem spriteFrameImage.size = graphicsInfo->size; spriteTemplate.images = &spriteFrameImage; objectEventId = TrySetupObjectEventSprite(objectEventTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); - if (objectEventId == EVENT_OBJECTS_COUNT) - return EVENT_OBJECTS_COUNT; + if (objectEventId == OBJECT_EVENTS_COUNT) + return OBJECT_EVENTS_COUNT; gSprites[gObjectEvents[objectEventId].spriteId].images = graphicsInfo->images; if (subspriteTables) @@ -1626,7 +1626,7 @@ u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup) objectEventTemplate = GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup); if (!objectEventTemplate) - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; GetObjectEventMovingCameraOffset(&cameraX, &cameraY); return TrySpawnObjectEventTemplate(objectEventTemplate, mapNum, mapGroup, cameraX, cameraY); @@ -1773,7 +1773,7 @@ void RemoveObjectEventsOutsideView(void) u8 i, j; bool8 isActiveLinkPlayer; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerObjectEvents); j++) { @@ -1811,7 +1811,7 @@ void sub_808E16C(s16 x, s16 y) u8 i; ClearPlayerAvatarInfo(); - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (gObjectEvents[i].active) { @@ -2025,14 +2025,14 @@ const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId) { graphicsId = VarGetObjectEventGraphicsId(graphicsId - SPRITE_VAR); } - if (graphicsId == EVENT_OBJ_GFX_BARD) + if (graphicsId == OBJ_EVENT_GFX_BARD) { bard = GetCurrentMauvilleOldMan(); return gMauvilleOldManGraphicsInfoPointers[bard]; } if (graphicsId >= NUM_OBJECT_GRAPHICS_INFO) { - graphicsId = EVENT_OBJ_GFX_NINJA_BOY; + graphicsId = OBJ_EVENT_GFX_NINJA_BOY; } return gObjectEventGraphicsInfoPointers[graphicsId]; } @@ -2068,7 +2068,7 @@ void sub_808E75C(s16 x, s16 y) struct ObjectEvent *objectEvent; objectEventId = GetObjectEventIdByXY(x, y); - if (objectEventId != EVENT_OBJECTS_COUNT) + if (objectEventId != OBJECT_EVENTS_COUNT) { objectEvent = &gObjectEvents[objectEventId]; objectEvent->triggerGroundEffectsOnMove = TRUE; @@ -2126,7 +2126,7 @@ static void LoadObjectEventPalette(u16 paletteTag) { u16 i = FindObjectEventPaletteIndexByTag(paletteTag); - if (i != EVENT_OBJ_PAL_TAG_NONE) // always true + if (i != OBJ_EVENT_PAL_TAG_NONE) // always true { sub_808E8F4(&sObjectEventSpritePalettes[i]); } @@ -2136,7 +2136,7 @@ void Unused_LoadObjectEventPaletteSet(u16 *paletteTags) { u8 i; - for (i = 0; paletteTags[i] != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; paletteTags[i] != OBJ_EVENT_PAL_TAG_NONE; i++) { LoadObjectEventPalette(paletteTags[i]); } @@ -2172,7 +2172,7 @@ static u8 FindObjectEventPaletteIndexByTag(u16 tag) { u8 i; - for (i = 0; sObjectEventSpritePalettes[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; sObjectEventSpritePalettes[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (sObjectEventSpritePalettes[i].tag == tag) { @@ -2187,7 +2187,7 @@ void LoadPlayerObjectReflectionPalette(u16 tag, u8 slot) u8 i; PatchObjectPalette(tag, slot); - for (i = 0; gPlayerReflectionPaletteSets[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gPlayerReflectionPaletteSets[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gPlayerReflectionPaletteSets[i].tag == tag) { @@ -2203,7 +2203,7 @@ void LoadSpecialObjectReflectionPalette(u16 tag, u8 slot) sCurrentSpecialObjectPaletteTag = tag; PatchObjectPalette(tag, slot); - for (i = 0; gSpecialObjectReflectionPaletteSets[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gSpecialObjectReflectionPaletteSets[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gSpecialObjectReflectionPaletteSets[i].tag == tag) { @@ -2286,7 +2286,7 @@ void UpdateObjectEventCoordsForCameraUpdate(void) { dx = gCamera.x; dy = gCamera.y; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (gObjectEvents[i].active) { @@ -2305,7 +2305,7 @@ u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (gObjectEvents[i].active) { @@ -2315,7 +2315,7 @@ u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z) } } } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *objectEvent, u8 z) @@ -2576,7 +2576,7 @@ struct ObjectEventTemplate *GetBaseTemplateForObjectEvent(const struct ObjectEve { return NULL; } - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) { if (objectEvent->localId == gSaveBlock1Ptr->objectEventTemplates[i].localId) { @@ -2645,7 +2645,7 @@ void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup void InitObjectEventPalettes(u8 palSlot) { FreeAndReserveObjectSpritePalettes(); - sCurrentSpecialObjectPaletteTag = EVENT_OBJ_PAL_TAG_NONE; + sCurrentSpecialObjectPaletteTag = OBJ_EVENT_PAL_TAG_NONE; sCurrentReflectionType = palSlot; if (palSlot == 1) { @@ -2666,14 +2666,14 @@ u16 GetObjectPaletteTag(u8 palSlot) { return gObjectPaletteTagSets[sCurrentReflectionType][palSlot]; } - for (i = 0; gSpecialObjectReflectionPaletteSets[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gSpecialObjectReflectionPaletteSets[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gSpecialObjectReflectionPaletteSets[i].tag == sCurrentSpecialObjectPaletteTag) { return gSpecialObjectReflectionPaletteSets[i].data[sCurrentReflectionType]; } } - return EVENT_OBJ_PAL_TAG_NONE; + return OBJ_EVENT_PAL_TAG_NONE; } movement_type_empty_callback(MovementType_None) @@ -4877,7 +4877,7 @@ u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dir) else if (IsZCoordMismatchAt(objectEvent->currentElevation, x, y)) return COLLISION_ELEVATION_MISMATCH; else if (DoesObjectCollideWithObjectAt(objectEvent, x, y)) - return COLLISION_EVENT_OBJECT; + return COLLISION_OBJECT_EVENT; return COLLISION_NONE; } @@ -4939,7 +4939,7 @@ static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *objectEvent, s16 u8 i; struct ObjectEvent *curObject; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { curObject = &gObjectEvents[i]; if (curObject->active && curObject != objectEvent) @@ -5313,7 +5313,7 @@ void npc_apply_direction(struct ObjectEvent *objectEvent, struct Sprite *sprite, ShiftObjectEventCoords(objectEvent, x, y); oamt_npc_ministep_reset(sprite, direction, speed); sprite->animPaused = FALSE; - if (gLockedAnimObjectEvents != NULL && FindLockedObjectEventIndex(objectEvent) != EVENT_OBJECTS_COUNT) + if (gLockedAnimObjectEvents != NULL && FindLockedObjectEventIndex(objectEvent) != OBJECT_EVENTS_COUNT) { sprite->animPaused = TRUE; } @@ -6396,7 +6396,7 @@ bool8 MovementAction_FacePlayer_Step0(struct ObjectEvent *objectEvent, struct Sp { u8 playerObjectId; - if (!TryGetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0, &playerObjectId)) { FaceDirection(objectEvent, sprite, GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y)); } @@ -6408,7 +6408,7 @@ bool8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *objectEvent, struc { u8 playerObjectId; - if (!TryGetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0, &playerObjectId)) { FaceDirection(objectEvent, sprite, GetOppositeDirection(GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y))); } @@ -8375,7 +8375,7 @@ bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent) void FreezeObjectEvents(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) if (gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) FreezeObjectEvent(&gObjectEvents[i]); } @@ -8383,7 +8383,7 @@ void FreezeObjectEvents(void) void FreezeObjectEventsExceptOne(u8 objectEventId) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) if (i != objectEventId && gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) FreezeObjectEvent(&gObjectEvents[i]); } @@ -8401,7 +8401,7 @@ void UnfreezeObjectEvent(struct ObjectEvent *objectEvent) void UnfreezeObjectEvents(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) if (gObjectEvents[i].active) UnfreezeObjectEvent(&gObjectEvents[i]); } @@ -9083,12 +9083,12 @@ u8 FindLockedObjectEventIndex(struct ObjectEvent *objectEvent) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (gLockedAnimObjectEvents->objectEventIds[i] == objectEvent->localId) return i; } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } void CreateLevitateMovementTask(struct ObjectEvent *objectEvent) @@ -9132,7 +9132,7 @@ void sub_8098074(u8 var1, u8 var2) { u8 i; - for(i = 0; i < EVENT_OBJECTS_COUNT; i++) + for(i = 0; i < OBJECT_EVENTS_COUNT; i++) { if(i != var1 && i != var2 && gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) diff --git a/src/faraway_island.c b/src/faraway_island.c index 7e31d58f3d..f8e3eac145 100755 --- a/src/faraway_island.c +++ b/src/faraway_island.c @@ -323,7 +323,7 @@ bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *objectEvent) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) { - if (objectEvent->graphicsId == EVENT_OBJ_GFX_MEW) + if (objectEvent->graphicsId == OBJ_EVENT_GFX_MEW) return TRUE; } diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 2326ec1014..6973eb4874 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -268,7 +268,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatil else objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) return NULL; for (i = 0; i < 4; i++) @@ -289,14 +289,14 @@ static const u8 *GetInteractedObjectEventScript(struct MapPosition *position, u8 const u8 *script; objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); - if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; // Look for an object event on the other side of the counter. objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) return NULL; } diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 98e9c03c13..9c38b61f51 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -13,7 +13,7 @@ #include "constants/field_effects.h" #include "constants/songs.h" -#define EVENT_OBJ_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c +#define OBJ_EVENT_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c static void UpdateObjectReflectionSprite(struct Sprite *); static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite); @@ -81,7 +81,7 @@ static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent, const struct ObjectEventGraphicsInfo *graphicsInfo; graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); - if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE) + if (graphicsInfo->paletteTag2 != OBJ_EVENT_PAL_TAG_NONE) { if (graphicsInfo->paletteSlot == 0) { @@ -106,7 +106,7 @@ static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *objectEven const struct ObjectEventGraphicsInfo *graphicsInfo; graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); - if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE) + if (graphicsInfo->paletteTag2 != OBJ_EVENT_PAL_TAG_NONE) { PatchObjectPalette(graphicsInfo->paletteTag2, paletteNum); UpdateSpritePaletteWithWeather(paletteNum); @@ -1553,7 +1553,7 @@ static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset) struct Sprite *linkedSprite; SetObjectSubpriorityByZCoord(z, sprite, offset); - for (i = 0; i < EVENT_OBJECTS_COUNT; i ++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i ++) { struct ObjectEvent *objectEvent = &gObjectEvents[i]; if (objectEvent->active) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index f4f5f82bc3..d553dfb05f 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -32,7 +32,7 @@ #include "constants/species.h" static EWRAM_DATA u8 gUnknown_0203734C = 0; -EWRAM_DATA struct ObjectEvent gObjectEvents[EVENT_OBJECTS_COUNT] = {}; +EWRAM_DATA struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT] = {}; EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {}; // static declarations @@ -233,49 +233,49 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) = static const u8 sRivalAvatarGfxIds[][2] = { - {EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE, EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING, EVENT_OBJ_GFX_RIVAL_MAY_SURFING}, - {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, EVENT_OBJ_GFX_MAY_UNDERWATER}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE}, - {EVENT_OBJ_GFX_BRENDAN_FISHING, EVENT_OBJ_GFX_MAY_FISHING}, - {EVENT_OBJ_GFX_BRENDAN_WATERING, EVENT_OBJ_GFX_MAY_WATERING} + {OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_ACRO_BIKE, OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_SURFING, OBJ_EVENT_GFX_RIVAL_MAY_SURFING}, + {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, OBJ_EVENT_GFX_MAY_UNDERWATER}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE}, + {OBJ_EVENT_GFX_BRENDAN_FISHING, OBJ_EVENT_GFX_MAY_FISHING}, + {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING} }; static const u8 sPlayerAvatarGfxIds[][2] = { - {EVENT_OBJ_GFX_BRENDAN_NORMAL, EVENT_OBJ_GFX_MAY_NORMAL}, - {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE, EVENT_OBJ_GFX_MAY_MACH_BIKE}, - {EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE, EVENT_OBJ_GFX_MAY_ACRO_BIKE}, - {EVENT_OBJ_GFX_BRENDAN_SURFING, EVENT_OBJ_GFX_MAY_SURFING}, - {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, EVENT_OBJ_GFX_MAY_UNDERWATER}, - {EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE, EVENT_OBJ_GFX_MAY_FIELD_MOVE}, - {EVENT_OBJ_GFX_BRENDAN_FISHING, EVENT_OBJ_GFX_MAY_FISHING}, - {EVENT_OBJ_GFX_BRENDAN_WATERING, EVENT_OBJ_GFX_MAY_WATERING}, + {OBJ_EVENT_GFX_BRENDAN_NORMAL, OBJ_EVENT_GFX_MAY_NORMAL}, + {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, OBJ_EVENT_GFX_MAY_MACH_BIKE}, + {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE, OBJ_EVENT_GFX_MAY_ACRO_BIKE}, + {OBJ_EVENT_GFX_BRENDAN_SURFING, OBJ_EVENT_GFX_MAY_SURFING}, + {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, OBJ_EVENT_GFX_MAY_UNDERWATER}, + {OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_MAY_FIELD_MOVE}, + {OBJ_EVENT_GFX_BRENDAN_FISHING, OBJ_EVENT_GFX_MAY_FISHING}, + {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING}, }; -static const u8 sFRLGAvatarGfxIds[] = {EVENT_OBJ_GFX_RED, EVENT_OBJ_GFX_LEAF}; +static const u8 sFRLGAvatarGfxIds[] = {OBJ_EVENT_GFX_RED, OBJ_EVENT_GFX_LEAF}; -static const u8 sRSAvatarGfxIds[] = {EVENT_OBJ_GFX_LINK_RS_BRENDAN, EVENT_OBJ_GFX_LINK_RS_MAY}; +static const u8 sRSAvatarGfxIds[] = {OBJ_EVENT_GFX_LINK_RS_BRENDAN, OBJ_EVENT_GFX_LINK_RS_MAY}; static const u8 gUnknown_0849750C[2][5][2] = { //male { - {EVENT_OBJ_GFX_BRENDAN_NORMAL, 1}, - {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE, 2}, - {EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE, 4}, - {EVENT_OBJ_GFX_BRENDAN_SURFING, 8}, - {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, 16}, + {OBJ_EVENT_GFX_BRENDAN_NORMAL, 1}, + {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, 2}, + {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE, 4}, + {OBJ_EVENT_GFX_BRENDAN_SURFING, 8}, + {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, 16}, }, //female { - {EVENT_OBJ_GFX_MAY_NORMAL, 1}, - {EVENT_OBJ_GFX_MAY_MACH_BIKE, 2}, - {EVENT_OBJ_GFX_MAY_ACRO_BIKE, 4}, - {EVENT_OBJ_GFX_MAY_SURFING, 8}, - {EVENT_OBJ_GFX_MAY_UNDERWATER, 16}, + {OBJ_EVENT_GFX_MAY_NORMAL, 1}, + {OBJ_EVENT_GFX_MAY_MACH_BIKE, 2}, + {OBJ_EVENT_GFX_MAY_ACRO_BIKE, 4}, + {OBJ_EVENT_GFX_MAY_SURFING, 8}, + {OBJ_EVENT_GFX_MAY_UNDERWATER, 16}, } }; @@ -620,7 +620,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) PlayerJumpLedge(direction); return; } - else if (collision == COLLISION_EVENT_OBJECT && IsPlayerCollidingWithFarawayIslandMew(direction)) + else if (collision == COLLISION_OBJECT_EVENT && IsPlayerCollidingWithFarawayIslandMew(direction)) { PlayerNotOnBikeCollideWithFarawayIslandMew(direction); return; @@ -687,7 +687,7 @@ u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u IncrementGameStat(GAME_STAT_JUMPED_DOWN_LEDGES); return COLLISION_LEDGE_JUMP; } - if (collision == COLLISION_EVENT_OBJECT && TryPushBoulder(x, y, direction)) + if (collision == COLLISION_OBJECT_EVENT && TryPushBoulder(x, y, direction)) return COLLISION_PUSHED_BOULDER; if (collision == COLLISION_NONE) @@ -716,7 +716,7 @@ static bool8 CanStopSurfing(s16 x, s16 y, u8 direction) { if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) && MapGridGetZCoordAt(x, y) == 3 - && GetObjectEventIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT) + && GetObjectEventIdByXYZ(x, y, 3) == OBJECT_EVENTS_COUNT) { CreateStopSurfingTask(direction); return TRUE; @@ -741,7 +741,7 @@ static bool8 TryPushBoulder(s16 x, s16 y, u8 direction) { u8 objectEventId = GetObjectEventIdByXY(x, y); - if (objectEventId != 16 && gObjectEvents[objectEventId].graphicsId == EVENT_OBJ_GFX_PUSHABLE_BOULDER) + if (objectEventId != 16 && gObjectEvents[objectEventId].graphicsId == OBJ_EVENT_GFX_PUSHABLE_BOULDER) { x = gObjectEvents[objectEventId].currentCoords.x; y = gObjectEvents[objectEventId].currentCoords.y; @@ -785,7 +785,7 @@ bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction) MoveCoords(direction, &playerX, &playerY); mewObjectId = GetObjectEventIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); - if (mewObjectId == EVENT_OBJECTS_COUNT) + if (mewObjectId == OBJECT_EVENTS_COUNT) return FALSE; object = &gObjectEvents[mewObjectId]; @@ -1248,14 +1248,14 @@ u8 unref_GetRivalAvatarGenderByGraphicsId(u8 gfxId) { switch (gfxId) { - case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL: - case EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE: - case EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE: - case EVENT_OBJ_GFX_RIVAL_MAY_SURFING: - case EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE: - case EVENT_OBJ_GFX_MAY_UNDERWATER: - case EVENT_OBJ_GFX_MAY_FISHING: - case EVENT_OBJ_GFX_MAY_WATERING: + case OBJ_EVENT_GFX_RIVAL_MAY_NORMAL: + case OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE: + case OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE: + case OBJ_EVENT_GFX_RIVAL_MAY_SURFING: + case OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE: + case OBJ_EVENT_GFX_MAY_UNDERWATER: + case OBJ_EVENT_GFX_MAY_FISHING: + case OBJ_EVENT_GFX_MAY_WATERING: return FEMALE; default: return MALE; @@ -1266,14 +1266,14 @@ u8 GetPlayerAvatarGenderByGraphicsId(u8 gfxId) { switch (gfxId) { - case EVENT_OBJ_GFX_MAY_NORMAL: - case EVENT_OBJ_GFX_MAY_MACH_BIKE: - case EVENT_OBJ_GFX_MAY_ACRO_BIKE: - case EVENT_OBJ_GFX_MAY_SURFING: - case EVENT_OBJ_GFX_MAY_FIELD_MOVE: - case EVENT_OBJ_GFX_MAY_UNDERWATER: - case EVENT_OBJ_GFX_MAY_FISHING: - case EVENT_OBJ_GFX_MAY_WATERING: + case OBJ_EVENT_GFX_MAY_NORMAL: + case OBJ_EVENT_GFX_MAY_MACH_BIKE: + case OBJ_EVENT_GFX_MAY_ACRO_BIKE: + case OBJ_EVENT_GFX_MAY_SURFING: + case OBJ_EVENT_GFX_MAY_FIELD_MOVE: + case OBJ_EVENT_GFX_MAY_UNDERWATER: + case OBJ_EVENT_GFX_MAY_FISHING: + case OBJ_EVENT_GFX_MAY_WATERING: return FEMALE; default: return MALE; @@ -1370,7 +1370,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) u8 objectEventId; struct ObjectEvent *objectEvent; - playerEventObjTemplate.localId = EVENT_OBJ_ID_PLAYER; + playerEventObjTemplate.localId = OBJ_EVENT_ID_PLAYER; playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); playerEventObjTemplate.x = x - 7; playerEventObjTemplate.y = y - 7; diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 7e092d7484..56ebea8ada 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -283,7 +283,7 @@ void Task_HandlePorthole(u8 taskId) case IDLE_CHECK: if (gMain.newKeys & A_BUTTON) data[1] = 1; - if (!ScriptMovement_IsObjectMovementFinished(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup)) + if (!ScriptMovement_IsObjectMovementFinished(OBJ_EVENT_ID_PLAYER, location->mapNum, location->mapGroup)) return; if (CountSSTidalStep(1) == TRUE) { @@ -305,12 +305,12 @@ void Task_HandlePorthole(u8 taskId) if (*cruiseState == SS_TIDAL_DEPART_SLATEPORT) { - ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailEastMovementScript); + ScriptMovement_StartObjectMovementScript(OBJ_EVENT_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailEastMovementScript); data[0] = IDLE_CHECK; } else { - ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailWestMovementScript); + ScriptMovement_StartObjectMovementScript(OBJ_EVENT_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailWestMovementScript); data[0] = IDLE_CHECK; } break; @@ -326,7 +326,7 @@ void Task_HandlePorthole(u8 taskId) static void ShowSSTidalWhileSailing(void) { - u8 spriteId = AddPseudoObjectEvent(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); + u8 spriteId = AddPseudoObjectEvent(OBJ_EVENT_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); gSprites[spriteId].coordOffsetEnabled = FALSE; diff --git a/src/field_specials.c b/src/field_specials.c index 37479b111f..f83190613a 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -575,21 +575,21 @@ void SpawnLinkPartnerObjectEvent(void) case VERSION_RUBY: case VERSION_SAPPHIRE: if (gLinkPlayers[i].gender == 0) - linkSpriteId = EVENT_OBJ_GFX_LINK_RS_BRENDAN; + linkSpriteId = OBJ_EVENT_GFX_LINK_RS_BRENDAN; else - linkSpriteId = EVENT_OBJ_GFX_LINK_RS_MAY; + linkSpriteId = OBJ_EVENT_GFX_LINK_RS_MAY; break; case VERSION_EMERALD: if (gLinkPlayers[i].gender == 0) - linkSpriteId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL; else - linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL; break; default: if (gLinkPlayers[i].gender == 0) - linkSpriteId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL; else - linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL; break; } SpawnSpecialObjectEventParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); @@ -608,13 +608,13 @@ static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEvent u8 adjustedPaletteNum; // Note: This temp var is necessary; paletteNum += 6 doesn't match. adjustedPaletteNum = paletteNum + 6; - if (graphicsId == EVENT_OBJ_GFX_LINK_RS_BRENDAN || - graphicsId == EVENT_OBJ_GFX_LINK_RS_MAY || - graphicsId == EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL || - graphicsId == EVENT_OBJ_GFX_RIVAL_MAY_NORMAL) + if (graphicsId == OBJ_EVENT_GFX_LINK_RS_BRENDAN || + graphicsId == OBJ_EVENT_GFX_LINK_RS_MAY || + graphicsId == OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL || + graphicsId == OBJ_EVENT_GFX_RIVAL_MAY_NORMAL) { u8 obj = GetObjectEventIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - if (obj != EVENT_OBJECTS_COUNT) + if (obj != OBJECT_EVENTS_COUNT) { u8 spriteId = gObjectEvents[obj].spriteId; struct Sprite *sprite = &gSprites[spriteId]; @@ -622,16 +622,16 @@ static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEvent switch (graphicsId) { - case EVENT_OBJ_GFX_LINK_RS_BRENDAN: + case OBJ_EVENT_GFX_LINK_RS_BRENDAN: LoadPalette(gObjectEventPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); break; - case EVENT_OBJ_GFX_LINK_RS_MAY: + case OBJ_EVENT_GFX_LINK_RS_MAY: LoadPalette(gObjectEventPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); break; - case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL: + case OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL: LoadPalette(gObjectEventPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); break; - case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL: + case OBJ_EVENT_GFX_RIVAL_MAY_NORMAL: LoadPalette(gObjectEventPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); break; } @@ -1304,7 +1304,7 @@ void IsGrassTypeInParty(void) void SpawnCameraObject(void) { - u8 obj = SpawnSpecialObjectEventParameterized(EVENT_OBJ_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); + u8 obj = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); gObjectEvents[obj].invisible = TRUE; CameraObjectSetFollowedObjectId(gObjectEvents[obj].spriteId); } @@ -1312,7 +1312,7 @@ void SpawnCameraObject(void) void RemoveCameraObject(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveObjectEventByLocalIdAndMap(EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } u8 GetPokeblockNameByMonNature(void) @@ -2843,11 +2843,11 @@ void SetBattleTowerLinkPlayerGfx(void) { if (gLinkPlayers[i].gender == MALE) { - VarSet(VAR_OBJ_GFX_ID_F - i, EVENT_OBJ_GFX_BRENDAN_NORMAL); + VarSet(VAR_OBJ_GFX_ID_F - i, OBJ_EVENT_GFX_BRENDAN_NORMAL); } else { - VarSet(VAR_OBJ_GFX_ID_F - i, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL); + VarSet(VAR_OBJ_GFX_ID_F - i, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL); } } } diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index f0d4e46b35..4ab2a43967 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -145,7 +145,7 @@ bool8 SetUpFieldMove_Cut(void) bool8 cutTiles[CUT_NORMAL_AREA]; bool8 ret; - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_CUTTABLE_TREE) == TRUE) { // Standing in front of cuttable tree. gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index cf806b55ee..e8f901679b 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -125,7 +125,7 @@ bool8 SetUpFieldMove_RockSmash(void) gPostMenuFieldCallback = SetUpPuzzleEffectRegirock; return TRUE; } - else if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) + else if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_BREAKABLE_ROCK) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_81356C4; diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 47fc7061cb..f479ef68d7 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -17,7 +17,7 @@ static void sub_8145E74(void); // text bool8 SetUpFieldMove_Strength(void) { - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_PUSHABLE_BOULDER) == TRUE) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/frontier_util.c b/src/frontier_util.c index 032bce198c..e102c139a9 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -665,13 +665,13 @@ static const struct WindowTemplate gUnknown_08611C84 = // Second field - whether the character is female. static const u8 sFacilityToBrainEventObjGfx[][2] = { - [FRONTIER_FACILITY_TOWER] = {EVENT_OBJ_GFX_ANABEL, TRUE}, - [FRONTIER_FACILITY_DOME] = {EVENT_OBJ_GFX_TUCKER, FALSE}, - [FRONTIER_FACILITY_PALACE] = {EVENT_OBJ_GFX_SPENSER, FALSE}, - [FRONTIER_FACILITY_ARENA] = {EVENT_OBJ_GFX_GRETA, TRUE}, - [FRONTIER_FACILITY_FACTORY] = {EVENT_OBJ_GFX_NOLAND, FALSE}, - [FRONTIER_FACILITY_PIKE] = {EVENT_OBJ_GFX_LUCY, TRUE}, - [FRONTIER_FACILITY_PYRAMID] = {EVENT_OBJ_GFX_BRANDON, FALSE}, + [FRONTIER_FACILITY_TOWER] = {OBJ_EVENT_GFX_ANABEL, TRUE}, + [FRONTIER_FACILITY_DOME] = {OBJ_EVENT_GFX_TUCKER, FALSE}, + [FRONTIER_FACILITY_PALACE] = {OBJ_EVENT_GFX_SPENSER, FALSE}, + [FRONTIER_FACILITY_ARENA] = {OBJ_EVENT_GFX_GRETA, TRUE}, + [FRONTIER_FACILITY_FACTORY] = {OBJ_EVENT_GFX_NOLAND, FALSE}, + [FRONTIER_FACILITY_PIKE] = {OBJ_EVENT_GFX_LUCY, TRUE}, + [FRONTIER_FACILITY_PYRAMID] = {OBJ_EVENT_GFX_BRANDON, FALSE}, }; const u16 gFrontierBannedSpecies[] = diff --git a/src/item_use.c b/src/item_use.c index e0917b8099..8ed9850cd4 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -558,15 +558,15 @@ u8 sub_80FD9B0(s16 itemX, s16 itemY) void sub_80FDA24(u8 direction) { - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); - ObjectEventClearHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); - UnfreezeObjectEvent(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); + UnfreezeObjectEvent(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); PlayerTurnInPlace(direction); } void sub_80FDA94(u8 taskId) { - if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]) == TRUE) DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC); } @@ -574,7 +574,7 @@ void sub_80FDADC(u8 taskId) { s16 *data = gTasks[taskId].data; - if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]) == TRUE || data[2] == FALSE) { sub_80FDA24(gUnknown_085920E4[data[5]]); @@ -707,7 +707,7 @@ bool8 TryToWaterSudowoodo(void) GetXYCoordsOneStepInFrontOfPlayer(&x, &y); z = PlayerGetZCoord(); objId = GetObjectEventIdByXYZ(x, y, z); - if (objId == EVENT_OBJECTS_COUNT || gObjectEvents[objId].graphicsId != EVENT_OBJ_GFX_SUDOWOODO) + if (objId == OBJECT_EVENTS_COUNT || gObjectEvents[objId].graphicsId != OBJ_EVENT_GFX_SUDOWOODO) return FALSE; else return TRUE; diff --git a/src/load_save.c b/src/load_save.c index 5b02e4cc54..8459cd96b3 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -185,7 +185,7 @@ void SaveObjectEvents(void) { int i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i]; } @@ -193,7 +193,7 @@ void LoadObjectEvents(void) { int i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i]; } diff --git a/src/match_call.c b/src/match_call.c index 1fc5520d95..fec01c8015 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1288,7 +1288,7 @@ static bool32 sub_81963F0(u8 taskId) if (!gMatchCallState.triggeredFromScript) { sub_81973A4(); - playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index add48efd86..9ebd1236da 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -676,7 +676,7 @@ static void Task_BardSong(u8 taskId) void ScrSpecial_SetMauvilleOldManEventObjGfx(void) { - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BARD); } // Language fixers? diff --git a/src/naming_screen.c b/src/naming_screen.c index c140e328e0..b394cd2f76 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1199,7 +1199,7 @@ static void NamingScreen_CreateWandaDadIcon(void) { u8 spriteId; - spriteId = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoObjectEvent(OBJ_EVENT_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } diff --git a/src/overworld.c b/src/overworld.c index 65a4a4c721..a3a1ba22ea 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -510,7 +510,7 @@ void LoadSaveblockEventObjScripts(void) struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; s32 i; - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) savObjTemplates[i].script = mapHeaderObjTemplates[i].script; } @@ -519,7 +519,7 @@ void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y) s32 i; struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) { struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i]; if (objectEventTemplate->localId == localId) @@ -536,7 +536,7 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType) s32 i; struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) { struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i]; if (objectEventTemplate->localId == localId) diff --git a/src/rotating_tile_puzzle.c b/src/rotating_tile_puzzle.c index 48bedc0572..72f1afa554 100644 --- a/src/rotating_tile_puzzle.c +++ b/src/rotating_tile_puzzle.c @@ -29,7 +29,7 @@ struct RotatingTileObject struct RotatingTilePuzzle { - struct RotatingTileObject objects[EVENT_OBJECTS_COUNT]; + struct RotatingTileObject objects[OBJECT_EVENTS_COUNT]; u8 numObjects; bool8 isTrickHouse; }; @@ -57,7 +57,7 @@ void FreeRotatingTilePuzzle(void) if (sRotatingTilePuzzle != NULL) FREE_AND_SET_NULL(sRotatingTilePuzzle); - id = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + id = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[id]); ScriptMovement_UnfreezeObjectEvents(); } @@ -68,7 +68,7 @@ u16 MoveRotatingTileObjects(u8 puzzleNumber) struct ObjectEventTemplate *objectEvents = gSaveBlock1Ptr->objectEventTemplates; u16 localId = 0; - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) { s32 puzzleTileStart; u8 puzzleTileNum; @@ -127,7 +127,7 @@ u16 MoveRotatingTileObjects(u8 puzzleNumber) objectEvents[i].x += x; objectEvents[i].y += y; - if (GetObjectEventIdByLocalIdAndMap(objectEvents[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT) + if (GetObjectEventIdByLocalIdAndMap(objectEvents[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != OBJECT_EVENTS_COUNT) { SaveRotatingTileObject(i, puzzleTileNum); localId = objectEvents[i].localId; @@ -195,7 +195,7 @@ void TurnRotatingTileObjects(void) } objectEventId = GetObjectEventIdByLocalIdAndMap(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - if (objectEventId != EVENT_OBJECTS_COUNT) + if (objectEventId != OBJECT_EVENTS_COUNT) { const u8 *movementScript; u8 direction = gObjectEvents[objectEventId].facingDirection; diff --git a/src/scrcmd.c b/src/scrcmd.c index f712d6f44c..f164891fe1 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1244,7 +1244,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) u8 playerObjectId; HideFieldMessageBox(); - playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); @@ -1258,7 +1258,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) HideFieldMessageBox(); if (gObjectEvents[gSelectedObjectEvent].active) ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); - playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); diff --git a/src/script_movement.c b/src/script_movement.c index 21f0661097..292b1230c6 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -18,7 +18,7 @@ static void ScriptMovement_MoveObjects(u8 taskId); static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript); // EWRAM_DATA -static EWRAM_DATA const u8 *gMovementScripts[EVENT_OBJECTS_COUNT] = {0}; +static EWRAM_DATA const u8 *gMovementScripts[OBJECT_EVENTS_COUNT] = {0}; // text bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript) @@ -42,7 +42,7 @@ bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup return TRUE; taskId = GetMoveObjectsTaskId(); moveScrId = GetMovementScriptIdFromObjectEventId(taskId, objEventId); - if (moveScrId == EVENT_OBJECTS_COUNT) + if (moveScrId == OBJECT_EVENTS_COUNT) return TRUE; return IsMovementScriptFinished(taskId, moveScrId); } @@ -80,7 +80,7 @@ static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 u8 moveScrId; moveScrId = GetMovementScriptIdFromObjectEventId(taskId, objEventId); - if (moveScrId != EVENT_OBJECTS_COUNT) + if (moveScrId != OBJECT_EVENTS_COUNT) { if (IsMovementScriptFinished(taskId, moveScrId) == 0) { @@ -92,8 +92,8 @@ static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 return FALSE; } } - moveScrId = GetMovementScriptIdFromObjectEventId(taskId, EVENT_OBJ_ID_PLAYER); - if (moveScrId == EVENT_OBJECTS_COUNT) + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, OBJ_EVENT_ID_PLAYER); + if (moveScrId == OBJECT_EVENTS_COUNT) { return TRUE; } @@ -110,12 +110,12 @@ static u8 GetMovementScriptIdFromObjectEventId(u8 taskId, u8 objEventId) u8 i; moveScriptId = (u8 *)&gTasks[taskId].data[1]; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++, moveScriptId++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++, moveScriptId++) { if (*moveScriptId == objEventId) return i; } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } static void LoadObjectEventIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pEventObjId) @@ -188,7 +188,7 @@ static void ScriptMovement_UnfreezeActiveObjects(u8 taskId) u8 i; pEventObjId = (u8 *)&gTasks[taskId].data[1]; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++, pEventObjId++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++, pEventObjId++) { if (*pEventObjId != 0xFF) UnfreezeObjectEvent(&gObjectEvents[*pEventObjId]); @@ -200,7 +200,7 @@ static void ScriptMovement_MoveObjects(u8 taskId) u8 i; u8 objEventId; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { LoadObjectEventIdFromMovementScript(taskId, i, &objEventId); if (objEventId != 0xFF) diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index a79c37d8cd..f1f5bdb6f8 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -247,9 +247,9 @@ void SetLinkContestPlayerGfx(void) if (version == VERSION_RUBY || version == VERSION_SAPPHIRE) { if (gLinkPlayers[i].gender == MALE) - gContestMons[i].trainerGfxId = EVENT_OBJ_GFX_LINK_RS_BRENDAN; + gContestMons[i].trainerGfxId = OBJ_EVENT_GFX_LINK_RS_BRENDAN; else - gContestMons[i].trainerGfxId = EVENT_OBJ_GFX_LINK_RS_MAY; + gContestMons[i].trainerGfxId = OBJ_EVENT_GFX_LINK_RS_MAY; } } diff --git a/src/secret_base.c b/src/secret_base.c index 3cbbab0dc4..866727ab39 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -147,17 +147,17 @@ static const struct YesNoFuncTable sDeleteRegistryYesNoFuncs = static const u8 sSecretBaseOwnerGfxIds[10] = { // Male - EVENT_OBJ_GFX_YOUNGSTER, - EVENT_OBJ_GFX_BUG_CATCHER, - EVENT_OBJ_GFX_RICH_BOY, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_MAN_3, + OBJ_EVENT_GFX_YOUNGSTER, + OBJ_EVENT_GFX_BUG_CATCHER, + OBJ_EVENT_GFX_RICH_BOY, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_MAN_3, // Female - EVENT_OBJ_GFX_LASS, - EVENT_OBJ_GFX_GIRL_3, - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_WOMAN_5, + OBJ_EVENT_GFX_LASS, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_WOMAN_5, }; static const struct WindowTemplate sRegistryWindowTemplates[] = @@ -576,7 +576,7 @@ void InitSecretBaseDecorationSprites(void) if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE || MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE) { - gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objectEventId].graphicsId - EVENT_OBJ_GFX_VAR_0); + gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objectEventId].graphicsId - OBJ_EVENT_GFX_VAR_0); VarSet(gSpecialVar_Result, gDecorations[decorations[i]].tiles[0]); gSpecialVar_Result = gMapHeader.events->objectEvents[objectEventId].localId; FlagClear(FLAG_DECORATION_1 + gSpecialVar_0x8004); diff --git a/src/shop.c b/src/shop.c index 7a51b32b89..465a581b2b 100755 --- a/src/shop.c +++ b/src/shop.c @@ -797,7 +797,7 @@ static void BuyMenuCollectObjectEventData(void) GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY); for (y = 0; y < 16; y++) - gShopDataPtr->viewportObjects[y][EVENT_OBJ_ID] = 16; + gShopDataPtr->viewportObjects[y][OBJ_EVENT_ID] = 16; for (y = 0; y < 5; y++) { for (x = 0; x < 7; x++) @@ -806,7 +806,7 @@ static void BuyMenuCollectObjectEventData(void) if (objEventId != 16) { - gShopDataPtr->viewportObjects[r8][EVENT_OBJ_ID] = objEventId; + gShopDataPtr->viewportObjects[r8][OBJ_EVENT_ID] = objEventId; gShopDataPtr->viewportObjects[r8][X_COORD] = x; gShopDataPtr->viewportObjects[r8][Y_COORD] = y; gShopDataPtr->viewportObjects[r8][LAYER_TYPE] = MapGridGetMetatileLayerTypeAt(facingX - 4 + x, facingY - 2 + y); @@ -841,13 +841,13 @@ static void BuyMenuDrawObjectEvents(void) for (i = 0; i < 16; i++) // max objects? { - if (gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID] == 16) + if (gShopDataPtr->viewportObjects[i][OBJ_EVENT_ID] == 16) continue; - graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[gShopDataPtr->viewportObjects[i][OBJ_EVENT_ID]].graphicsId); spriteId = AddPseudoObjectEvent( - gObjectEvents[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId, + gObjectEvents[gShopDataPtr->viewportObjects[i][OBJ_EVENT_ID]].graphicsId, SpriteCallbackDummy, (u16)gShopDataPtr->viewportObjects[i][X_COORD] * 16 + 8, (u16)gShopDataPtr->viewportObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2, diff --git a/src/trainer_hill.c b/src/trainer_hill.c index f7b08f350b..8a2f9a8fda 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -253,7 +253,7 @@ static const u8 *const sTagMatchStrings[] = static const struct ObjectEventTemplate sTrainerObjectEventTemplate = { - .graphicsId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, + .graphicsId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, .elevation = 3, .movementType = MOVEMENT_TYPE_LOOK_AROUND, .movementRangeX = 1, diff --git a/src/trainer_see.c b/src/trainer_see.c index 8b5e74d137..16d41fced1 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -179,7 +179,7 @@ bool8 CheckForTrainersWantingBattle(void) gNoOfApproachingTrainers = 0; gApproachingTrainerId = 0; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { u8 retVal; @@ -774,15 +774,15 @@ void PlayerFaceTrainerAfterBattle(void) objEvent = &gObjectEvents[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].objectEventId]; gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(objEvent->facingDirection)); gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; - ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); + ScriptMovement_StartObjectMovementScript(OBJ_EVENT_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); } else { objEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(objEvent->facingDirection); gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; - ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); + ScriptMovement_StartObjectMovementScript(OBJ_EVENT_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); } - SetMovingNpcId(EVENT_OBJ_ID_PLAYER); + SetMovingNpcId(OBJ_EVENT_ID_PLAYER); } diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c index 2fadad6bd4..e1b633ebbc 100644 --- a/src/union_room_player_avatar.c +++ b/src/union_room_player_avatar.c @@ -391,7 +391,7 @@ void sub_8019E70(u8 * sp8, s32 r9) for (r7 = 0; r7 < 5; r7++) { s32 r5 = 5 * r9 + r7; - sp8[r5] = sprite_new(EVENT_OBJ_GFX_MAN_4, r5 - 0x38, gUnknown_082F0740[r9][0] + gUnknown_082F0760[r7][0], gUnknown_082F0740[r9][1] + gUnknown_082F0760[r7][1], 3, 1); + sp8[r5] = sprite_new(OBJ_EVENT_GFX_MAN_4, r5 - 0x38, gUnknown_082F0740[r9][0] + gUnknown_082F0760[r7][0], gUnknown_082F0740[r9][1] + gUnknown_082F0760[r7][1], 3, 1); sub_8097C44(r5 - 0x38, TRUE); } } From 98b81722e73bbc97145c7b2b20e160084dbd3587 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 20 Nov 2019 23:54:22 -0500 Subject: [PATCH 03/13] Rename field_objet_palettes --- ...tte_00.pal => event_object_palette_00.pal} | 0 ...tte_01.pal => event_object_palette_01.pal} | 0 ...tte_02.pal => event_object_palette_02.pal} | 0 ...tte_03.pal => event_object_palette_03.pal} | 0 ...tte_04.pal => event_object_palette_04.pal} | 0 ...tte_05.pal => event_object_palette_05.pal} | 0 ...tte_06.pal => event_object_palette_06.pal} | 0 ...tte_07.pal => event_object_palette_07.pal} | 0 ...tte_08.pal => event_object_palette_08.pal} | 0 ...tte_09.pal => event_object_palette_09.pal} | 0 ...tte_10.pal => event_object_palette_10.pal} | 0 ...tte_11.pal => event_object_palette_11.pal} | 0 ...tte_12.pal => event_object_palette_12.pal} | 0 ...tte_13.pal => event_object_palette_13.pal} | 0 ...tte_14.pal => event_object_palette_14.pal} | 0 ...tte_15.pal => event_object_palette_15.pal} | 0 ...tte_16.pal => event_object_palette_16.pal} | 0 ...tte_17.pal => event_object_palette_17.pal} | 0 ...tte_18.pal => event_object_palette_18.pal} | 0 ...tte_19.pal => event_object_palette_19.pal} | 0 ...tte_20.pal => event_object_palette_20.pal} | 0 ...tte_21.pal => event_object_palette_21.pal} | 0 ...tte_22.pal => event_object_palette_22.pal} | 0 ...tte_23.pal => event_object_palette_23.pal} | 0 ...tte_24.pal => event_object_palette_24.pal} | 0 ...tte_25.pal => event_object_palette_25.pal} | 0 ...tte_26.pal => event_object_palette_26.pal} | 0 ...tte_27.pal => event_object_palette_27.pal} | 0 ...tte_28.pal => event_object_palette_28.pal} | 0 ...tte_29.pal => event_object_palette_29.pal} | 0 ...tte_30.pal => event_object_palette_30.pal} | 0 ...tte_31.pal => event_object_palette_31.pal} | 0 ...tte_32.pal => event_object_palette_32.pal} | 0 ...tte_33.pal => event_object_palette_33.pal} | 0 ...tte_34.pal => event_object_palette_34.pal} | 0 src/data/event_object/event_object_graphics.h | 70 +++++++++---------- 36 files changed, 35 insertions(+), 35 deletions(-) rename graphics/event_objects/palettes/{field_object_palette_00.pal => event_object_palette_00.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_01.pal => event_object_palette_01.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_02.pal => event_object_palette_02.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_03.pal => event_object_palette_03.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_04.pal => event_object_palette_04.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_05.pal => event_object_palette_05.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_06.pal => event_object_palette_06.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_07.pal => event_object_palette_07.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_08.pal => event_object_palette_08.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_09.pal => event_object_palette_09.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_10.pal => event_object_palette_10.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_11.pal => event_object_palette_11.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_12.pal => event_object_palette_12.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_13.pal => event_object_palette_13.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_14.pal => event_object_palette_14.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_15.pal => event_object_palette_15.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_16.pal => event_object_palette_16.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_17.pal => event_object_palette_17.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_18.pal => event_object_palette_18.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_19.pal => event_object_palette_19.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_20.pal => event_object_palette_20.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_21.pal => event_object_palette_21.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_22.pal => event_object_palette_22.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_23.pal => event_object_palette_23.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_24.pal => event_object_palette_24.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_25.pal => event_object_palette_25.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_26.pal => event_object_palette_26.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_27.pal => event_object_palette_27.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_28.pal => event_object_palette_28.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_29.pal => event_object_palette_29.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_30.pal => event_object_palette_30.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_31.pal => event_object_palette_31.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_32.pal => event_object_palette_32.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_33.pal => event_object_palette_33.pal} (100%) rename graphics/event_objects/palettes/{field_object_palette_34.pal => event_object_palette_34.pal} (100%) diff --git a/graphics/event_objects/palettes/field_object_palette_00.pal b/graphics/event_objects/palettes/event_object_palette_00.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_00.pal rename to graphics/event_objects/palettes/event_object_palette_00.pal diff --git a/graphics/event_objects/palettes/field_object_palette_01.pal b/graphics/event_objects/palettes/event_object_palette_01.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_01.pal rename to graphics/event_objects/palettes/event_object_palette_01.pal diff --git a/graphics/event_objects/palettes/field_object_palette_02.pal b/graphics/event_objects/palettes/event_object_palette_02.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_02.pal rename to graphics/event_objects/palettes/event_object_palette_02.pal diff --git a/graphics/event_objects/palettes/field_object_palette_03.pal b/graphics/event_objects/palettes/event_object_palette_03.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_03.pal rename to graphics/event_objects/palettes/event_object_palette_03.pal diff --git a/graphics/event_objects/palettes/field_object_palette_04.pal b/graphics/event_objects/palettes/event_object_palette_04.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_04.pal rename to graphics/event_objects/palettes/event_object_palette_04.pal diff --git a/graphics/event_objects/palettes/field_object_palette_05.pal b/graphics/event_objects/palettes/event_object_palette_05.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_05.pal rename to graphics/event_objects/palettes/event_object_palette_05.pal diff --git a/graphics/event_objects/palettes/field_object_palette_06.pal b/graphics/event_objects/palettes/event_object_palette_06.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_06.pal rename to graphics/event_objects/palettes/event_object_palette_06.pal diff --git a/graphics/event_objects/palettes/field_object_palette_07.pal b/graphics/event_objects/palettes/event_object_palette_07.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_07.pal rename to graphics/event_objects/palettes/event_object_palette_07.pal diff --git a/graphics/event_objects/palettes/field_object_palette_08.pal b/graphics/event_objects/palettes/event_object_palette_08.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_08.pal rename to graphics/event_objects/palettes/event_object_palette_08.pal diff --git a/graphics/event_objects/palettes/field_object_palette_09.pal b/graphics/event_objects/palettes/event_object_palette_09.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_09.pal rename to graphics/event_objects/palettes/event_object_palette_09.pal diff --git a/graphics/event_objects/palettes/field_object_palette_10.pal b/graphics/event_objects/palettes/event_object_palette_10.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_10.pal rename to graphics/event_objects/palettes/event_object_palette_10.pal diff --git a/graphics/event_objects/palettes/field_object_palette_11.pal b/graphics/event_objects/palettes/event_object_palette_11.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_11.pal rename to graphics/event_objects/palettes/event_object_palette_11.pal diff --git a/graphics/event_objects/palettes/field_object_palette_12.pal b/graphics/event_objects/palettes/event_object_palette_12.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_12.pal rename to graphics/event_objects/palettes/event_object_palette_12.pal diff --git a/graphics/event_objects/palettes/field_object_palette_13.pal b/graphics/event_objects/palettes/event_object_palette_13.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_13.pal rename to graphics/event_objects/palettes/event_object_palette_13.pal diff --git a/graphics/event_objects/palettes/field_object_palette_14.pal b/graphics/event_objects/palettes/event_object_palette_14.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_14.pal rename to graphics/event_objects/palettes/event_object_palette_14.pal diff --git a/graphics/event_objects/palettes/field_object_palette_15.pal b/graphics/event_objects/palettes/event_object_palette_15.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_15.pal rename to graphics/event_objects/palettes/event_object_palette_15.pal diff --git a/graphics/event_objects/palettes/field_object_palette_16.pal b/graphics/event_objects/palettes/event_object_palette_16.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_16.pal rename to graphics/event_objects/palettes/event_object_palette_16.pal diff --git a/graphics/event_objects/palettes/field_object_palette_17.pal b/graphics/event_objects/palettes/event_object_palette_17.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_17.pal rename to graphics/event_objects/palettes/event_object_palette_17.pal diff --git a/graphics/event_objects/palettes/field_object_palette_18.pal b/graphics/event_objects/palettes/event_object_palette_18.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_18.pal rename to graphics/event_objects/palettes/event_object_palette_18.pal diff --git a/graphics/event_objects/palettes/field_object_palette_19.pal b/graphics/event_objects/palettes/event_object_palette_19.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_19.pal rename to graphics/event_objects/palettes/event_object_palette_19.pal diff --git a/graphics/event_objects/palettes/field_object_palette_20.pal b/graphics/event_objects/palettes/event_object_palette_20.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_20.pal rename to graphics/event_objects/palettes/event_object_palette_20.pal diff --git a/graphics/event_objects/palettes/field_object_palette_21.pal b/graphics/event_objects/palettes/event_object_palette_21.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_21.pal rename to graphics/event_objects/palettes/event_object_palette_21.pal diff --git a/graphics/event_objects/palettes/field_object_palette_22.pal b/graphics/event_objects/palettes/event_object_palette_22.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_22.pal rename to graphics/event_objects/palettes/event_object_palette_22.pal diff --git a/graphics/event_objects/palettes/field_object_palette_23.pal b/graphics/event_objects/palettes/event_object_palette_23.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_23.pal rename to graphics/event_objects/palettes/event_object_palette_23.pal diff --git a/graphics/event_objects/palettes/field_object_palette_24.pal b/graphics/event_objects/palettes/event_object_palette_24.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_24.pal rename to graphics/event_objects/palettes/event_object_palette_24.pal diff --git a/graphics/event_objects/palettes/field_object_palette_25.pal b/graphics/event_objects/palettes/event_object_palette_25.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_25.pal rename to graphics/event_objects/palettes/event_object_palette_25.pal diff --git a/graphics/event_objects/palettes/field_object_palette_26.pal b/graphics/event_objects/palettes/event_object_palette_26.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_26.pal rename to graphics/event_objects/palettes/event_object_palette_26.pal diff --git a/graphics/event_objects/palettes/field_object_palette_27.pal b/graphics/event_objects/palettes/event_object_palette_27.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_27.pal rename to graphics/event_objects/palettes/event_object_palette_27.pal diff --git a/graphics/event_objects/palettes/field_object_palette_28.pal b/graphics/event_objects/palettes/event_object_palette_28.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_28.pal rename to graphics/event_objects/palettes/event_object_palette_28.pal diff --git a/graphics/event_objects/palettes/field_object_palette_29.pal b/graphics/event_objects/palettes/event_object_palette_29.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_29.pal rename to graphics/event_objects/palettes/event_object_palette_29.pal diff --git a/graphics/event_objects/palettes/field_object_palette_30.pal b/graphics/event_objects/palettes/event_object_palette_30.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_30.pal rename to graphics/event_objects/palettes/event_object_palette_30.pal diff --git a/graphics/event_objects/palettes/field_object_palette_31.pal b/graphics/event_objects/palettes/event_object_palette_31.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_31.pal rename to graphics/event_objects/palettes/event_object_palette_31.pal diff --git a/graphics/event_objects/palettes/field_object_palette_32.pal b/graphics/event_objects/palettes/event_object_palette_32.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_32.pal rename to graphics/event_objects/palettes/event_object_palette_32.pal diff --git a/graphics/event_objects/palettes/field_object_palette_33.pal b/graphics/event_objects/palettes/event_object_palette_33.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_33.pal rename to graphics/event_objects/palettes/event_object_palette_33.pal diff --git a/graphics/event_objects/palettes/field_object_palette_34.pal b/graphics/event_objects/palettes/event_object_palette_34.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_34.pal rename to graphics/event_objects/palettes/event_object_palette_34.pal diff --git a/src/data/event_object/event_object_graphics.h b/src/data/event_object/event_object_graphics.h index 3e44e4133c..28d62262d9 100755 --- a/src/data/event_object/event_object_graphics.h +++ b/src/data/event_object/event_object_graphics.h @@ -1,9 +1,9 @@ const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp"); const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp"); -const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal"); +const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_08.gbapal"); const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp"); const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp"); -const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal"); +const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_33.gbapal"); const u16 NullPalette_8499A38[16] = {}; const u16 NullPalette_8499A58[16] = {}; const u16 NullPalette_8499A78[16] = {}; @@ -19,8 +19,8 @@ const u16 NullPalette_8499B98[16] = {}; const u16 NullPalette_8499BB8[16] = {}; const u16 NullPalette_8499BD8[16] = {}; const u16 NullPalette_8499BF8[16] = {}; -const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal"); -const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal"); +const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_09.gbapal"); +const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_10.gbapal"); const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); @@ -31,14 +31,14 @@ const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objec const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); -const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal"); +const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_11.gbapal"); const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp"); const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp"); -const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal"); -const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal"); +const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_17.gbapal"); +const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_18.gbapal"); const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp"); const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp"); -const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal"); +const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_34.gbapal"); const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); const u16 NullPalette_84A54F8[16] = {}; const u16 NullPalette_84A5518[16] = {}; @@ -60,14 +60,14 @@ const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); -const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal"); -const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal"); -const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal"); -const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal"); -const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal"); -const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal"); -const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal"); -const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal"); +const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_00.gbapal"); +const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_01.gbapal"); +const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_02.gbapal"); +const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_03.gbapal"); +const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_04.gbapal"); +const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_05.gbapal"); +const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_06.gbapal"); +const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_07.gbapal"); const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp"); const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp"); const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); @@ -177,10 +177,10 @@ const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/po const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); -const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal"); -const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal"); -const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal"); -const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal"); +const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_22.gbapal"); +const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_23.gbapal"); +const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_24.gbapal"); +const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_25.gbapal"); const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); @@ -238,20 +238,20 @@ const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); -const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); +const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_26.gbapal"); const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); -const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal"); +const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_14.gbapal"); const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp"); -const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal"); +const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_15.gbapal"); const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp"); -const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal"); +const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_16.gbapal"); const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); -const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal"); +const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_27.gbapal"); const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); -const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); +const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_20.gbapal"); const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); -const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal"); +const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_21.gbapal"); const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle.4bpp"); const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); @@ -287,8 +287,8 @@ const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/ const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp"); const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); -const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); -const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal"); +const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_12.gbapal"); +const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_13.gbapal"); const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp"); const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp"); const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp"); @@ -339,15 +339,15 @@ const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/p const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp"); const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp"); const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); -const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal"); +const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_19.gbapal"); const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp"); const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp"); -const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal"); +const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_28.gbapal"); const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp"); const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp"); -const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal"); +const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_30.gbapal"); const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); -const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal"); +const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_29.gbapal"); const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp"); const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp"); const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp"); @@ -357,6 +357,6 @@ const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/peo const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp"); const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp"); const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp"); -const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); +const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_32.gbapal"); const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); -const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); +const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_31.gbapal"); From 7034f59c14fd6fad2634e9b35b405e2b33f75646 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 21 Nov 2019 00:14:40 -0500 Subject: [PATCH 04/13] Rename EventObj to ObjEvent --- .../MauvilleCity_PokemonCenter_1F/scripts.inc | 2 +- data/specials.inc | 2 +- include/battle_setup.h | 4 +- include/frontier_util.h | 4 +- include/mauville_old_man.h | 2 +- include/overworld.h | 8 +- src/battle_pike.c | 2 +- src/battle_setup.c | 12 +- src/battle_tower.c | 2 +- src/bike.c | 116 +++++++------- src/event_object_movement.c | 6 +- src/field_player_avatar.c | 150 +++++++++--------- src/field_specials.c | 2 +- src/fldeff_misc.c | 14 +- src/frontier_util.c | 14 +- src/mauville_old_man.c | 6 +- src/overworld.c | 94 +++++------ src/scrcmd.c | 4 +- src/script_movement.c | 16 +- 19 files changed, 230 insertions(+), 230 deletions(-) diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index f37f362e21..ee13ffcfd0 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66 end MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx:: @ 8210E74 - special ScrSpecial_SetMauvilleOldManEventObjGfx + special ScrSpecial_SetMauvilleOldManObjEventGfx end @ VAR_0x800B is the Nurse's object event id diff --git a/data/specials.inc b/data/specials.inc index 40e6296ac1..3f8368566d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -115,7 +115,7 @@ gSpecials:: @ 81DBA64 def_special ScrSpecial_SetHipsterSpokenFlag def_special ScrSpecial_HipsterTeachWord def_special ScrSpecial_PlayBardSong - def_special ScrSpecial_SetMauvilleOldManEventObjGfx + def_special ScrSpecial_SetMauvilleOldManObjEventGfx def_special ScrSpecial_GenerateGiddyLine def_special ScrSpecial_GiddyShouldTellAnotherTale def_special ScrSpecial_StorytellerGetFreeStorySlot diff --git a/include/battle_setup.h b/include/battle_setup.h index 984c820bbb..08fa60155f 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -34,8 +34,8 @@ void ChooseStarter(void); void ResetTrainerOpponentIds(void); void SetMapVarsToTrainer(void); const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); -void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript); -void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript); +void ConfigureAndSetUpOneTrainerBattle(u8 trainerObjEventId, const u8 *trainerScript); +void ConfigureTwoTrainersBattle(u8 trainerObjEventId, const u8 *trainerScript); void SetUpTwoTrainersBattle(void); bool32 GetTrainerFlagFromScriptPointer(const u8 *data); void SetUpTrainerMovement(void); diff --git a/include/frontier_util.h b/include/frontier_util.h index 627b5bef55..273c4cc200 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -16,10 +16,10 @@ u8 GetFrontierBrainTrainerPicIndex(void); u8 GetFrontierBrainTrainerClass(void); void CopyFrontierBrainTrainerName(u8 *dst); bool8 IsFrontierBrainFemale(void); -void SetFrontierBrainEventObjGfx_2(void); +void SetFrontierBrainObjEventGfx_2(void); void CreateFrontierBrainPokemon(void); u16 GetFrontierBrainMonSpecies(u8 monId); -void SetFrontierBrainEventObjGfx(u8 facility); +void SetFrontierBrainObjEventGfx(u8 facility); u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId); u8 GetFrontierBrainMonNature(u8 monId); u8 GetFrontierBrainMonEvs(u8 monId, u8 evStatId); diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h index 3845ac2902..29c66a992a 100644 --- a/include/mauville_old_man.h +++ b/include/mauville_old_man.h @@ -5,7 +5,7 @@ extern struct BardSong gBardSong; void SetMauvilleOldMan(void); u8 GetCurrentMauvilleOldMan(void); -void ScrSpecial_SetMauvilleOldManEventObjGfx(void); +void ScrSpecial_SetMauvilleOldManObjEventGfx(void); u8 sub_81201C8(void); void sub_8120B70(OldMan *dest); void sub_8120670(void); diff --git a/include/overworld.h b/include/overworld.h index dced95007e..0e3c7e006a 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -63,10 +63,10 @@ void IncrementGameStat(u8 index); u32 GetGameStat(u8 index); void SetGameStat(u8 index, u32 value); void ApplyNewEncryptionKeyToGameStats(u32 newKey); -void LoadEventObjTemplatesFromHeader(void); -void LoadSaveblockEventObjScripts(void); -void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y); -void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); +void LoadObjEventTemplatesFromHeader(void); +void LoadSaveblockObjEventScripts(void); +void Overworld_SetObjEventTemplateCoords(u8 localId, s16 x, s16 y); +void Overworld_SetObjEventTemplateMovementType(u8 localId, u8 movementType); const struct MapLayout *GetMapLayout(void); void ApplyCurrentWarp(void); struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); diff --git a/src/battle_pike.c b/src/battle_pike.c index 9b45c7b119..730063b88c 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -601,7 +601,7 @@ static void SetupRoomObjectEvents(void) setObjGfx1 = FALSE; break; case PIKE_ROOM_BRAIN: - SetFrontierBrainEventObjGfx(FRONTIER_FACILITY_PIKE); + SetFrontierBrainObjEventGfx(FRONTIER_FACILITY_PIKE); objGfx2 = OBJ_EVENT_GFX_LINK_RECEPTIONIST; setObjGfx1 = FALSE; setObjGfx2 = TRUE; diff --git a/src/battle_setup.c b/src/battle_setup.c index c63d38e706..ea4e807c7a 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1168,19 +1168,19 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) } } -void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript) +void ConfigureAndSetUpOneTrainerBattle(u8 trainerObjEventId, const u8 *trainerScript) { - gSelectedObjectEvent = trainerEventObjId; - gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId; + gSelectedObjectEvent = trainerObjEventId; + gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); ScriptContext1_SetupScript(EventScript_271354); ScriptContext2_Enable(); } -void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript) +void ConfigureTwoTrainersBattle(u8 trainerObjEventId, const u8 *trainerScript) { - gSelectedObjectEvent = trainerEventObjId; - gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId; + gSelectedObjectEvent = trainerObjEventId; + gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); } diff --git a/src/battle_tower.c b/src/battle_tower.c index 1f1220e22c..1995885710 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1414,7 +1414,7 @@ void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId) } else if (trainerId == TRAINER_FRONTIER_BRAIN) { - SetFrontierBrainEventObjGfx_2(); + SetFrontierBrainObjEventGfx_2(); return; } else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) diff --git a/src/bike.c b/src/bike.c index 0000ff181b..b265a31bb5 100644 --- a/src/bike.c +++ b/src/bike.c @@ -186,31 +186,31 @@ static void MachBikeTransition_FaceDirection(u8 direction) static void MachBikeTransition_TurnDirection(u8 direction) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior)) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior)) { PlayerTurnInPlace(direction); Bike_SetBikeStill(); } else { - MachBikeTransition_FaceDirection(playerEventObj->facingDirection); + MachBikeTransition_FaceDirection(playerObjEvent->facingDirection); } } static void MachBikeTransition_TrySpeedUp(u8 direction) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; u8 collision; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == FALSE) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == FALSE) { // we cannot go forward, so either slow down or, if we are stopped, idle face direction. if (gPlayerAvatar.bikeSpeed) - MachBikeTransition_TrySlowDown(playerEventObj->movementDirection); + MachBikeTransition_TrySlowDown(playerObjEvent->movementDirection); else - MachBikeTransition_FaceDirection(playerEventObj->movementDirection); + MachBikeTransition_FaceDirection(playerObjEvent->movementDirection); } else { @@ -366,10 +366,10 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct ObjectEvent *playerEventObj; + struct ObjectEvent *playerObjEvent; direction = GetPlayerMovementDirection(); - playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; gPlayerAvatar.runningState = NOT_MOVING; if (heldKeys & B_BUTTON) @@ -378,7 +378,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 { // B button was released. gPlayerAvatar.bikeFrameCounter = 0; - if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) { // Go back to normal on flat ground *newDirection = direction; @@ -413,15 +413,15 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct ObjectEvent *playerEventObj; + struct ObjectEvent *playerObjEvent; direction = GetPlayerMovementDirection(); - playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!(heldKeys & B_BUTTON)) { // B button was released Bike_SetBikeStill(); - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) { // even though B was released, dont undo the wheelie on the bumpy slope. gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; @@ -460,15 +460,15 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct ObjectEvent *playerEventObj; + struct ObjectEvent *playerObjEvent; direction = GetPlayerFacingDirection(); - playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!(heldKeys & B_BUTTON)) { // we were moving on a wheelie, but we let go while moving. reset bike still status Bike_SetBikeStill(); - if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) { // we let go of B and arent on a bumpy slope, set state to normal because now we need to handle this gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; @@ -514,10 +514,10 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->facingDirectionLocked = 0; - SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection); + playerObjEvent->facingDirectionLocked = 0; + SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection); gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; return CheckMovementInputAcroBike(ptr, newKeys, heldKeys); } @@ -535,21 +535,21 @@ static void AcroBikeTransition_FaceDirection(u8 direction) static void AcroBikeTransition_TurnDirection(u8 direction) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerFaceDirection(direction); } static void AcroBikeTransition_Moving(u8 direction) { u8 collision; - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - AcroBikeTransition_FaceDirection(playerEventObj->movementDirection); + AcroBikeTransition_FaceDirection(playerObjEvent->movementDirection); return; } collision = GetBikeCollision(direction); @@ -570,48 +570,48 @@ static void AcroBikeTransition_Moving(u8 direction) static void AcroBikeTransition_NormalToWheelie(u8 direction) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerStartWheelie(direction); } static void AcroBikeTransition_WheelieToNormal(u8 direction) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerEndWheelie(direction); } static void AcroBikeTransition_WheelieIdle(u8 direction) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerIdleWheelie(direction); } static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerStandingHoppingWheelie(direction); } static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) { u8 collision; - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - AcroBikeTransition_WheelieHoppingStanding(playerEventObj->movementDirection); + AcroBikeTransition_WheelieHoppingStanding(playerObjEvent->movementDirection); return; } collision = GetBikeCollision(direction); @@ -641,7 +641,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) static void AcroBikeTransition_SideJump(u8 direction) { u8 collision; - struct ObjectEvent *playerEventObj; + struct ObjectEvent *playerObjEvent; collision = GetBikeCollision(direction); if (collision) @@ -659,9 +659,9 @@ static void AcroBikeTransition_SideJump(u8 direction) return; } } - playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; PlaySE(SE_JITE_PYOKO); - playerEventObj->facingDirectionLocked = 1; + playerObjEvent->facingDirectionLocked = 1; PlayerSetAnimId(GetJumpMovementAction(direction), 2); } @@ -673,11 +673,11 @@ static void AcroBikeTransition_TurnJump(u8 direction) static void AcroBikeTransition_WheelieMoving(u8 direction) { u8 collision; - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - PlayerIdleWheelie(playerEventObj->movementDirection); + PlayerIdleWheelie(playerObjEvent->movementDirection); return; } collision = GetBikeCollision(direction); @@ -693,7 +693,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) } else if (collision < COLLISION_STOP_SURFING) { - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_808B980(direction); //hit wall? @@ -707,11 +707,11 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) static void AcroBikeTransition_WheelieRisingMoving(u8 direction) { u8 collision; - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - PlayerStartWheelie(playerEventObj->movementDirection); + PlayerStartWheelie(playerObjEvent->movementDirection); return; } collision = GetBikeCollision(direction); @@ -727,7 +727,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) } else if (collision < COLLISION_STOP_SURFING) { - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_808B980(direction); //hit wall? @@ -741,11 +741,11 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) { u8 collision; - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - PlayerEndWheelie(playerEventObj->movementDirection); + PlayerEndWheelie(playerObjEvent->movementDirection); return; } collision = GetBikeCollision(direction); @@ -868,12 +868,12 @@ static u8 Bike_DPadToDirection(u16 heldKeys) static u8 GetBikeCollision(u8 direction) { u8 metatitleBehavior; - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - s16 x = playerEventObj->currentCoords.x; - s16 y = playerEventObj->currentCoords.y; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + s16 x = playerObjEvent->currentCoords.x; + s16 y = playerObjEvent->currentCoords.y; MoveCoords(direction, &x, &y); metatitleBehavior = MapGridGetMetatileBehaviorAt(x, y); - return GetBikeCollisionAt(playerEventObj, x, y, direction, metatitleBehavior); + return GetBikeCollisionAt(playerObjEvent, x, y, direction, metatitleBehavior); } static u8 GetBikeCollisionAt(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatitleBehavior) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index e32af3e1e9..86999f2650 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -69,7 +69,7 @@ static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent *, s16, s static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *, s16, s16, u8); static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *, s16, s16); static void sub_8096530(struct ObjectEvent *, struct Sprite *); -static void UpdateEventObjSpriteVisibility(struct ObjectEvent *, struct Sprite *); +static void UpdateObjEventSpriteVisibility(struct ObjectEvent *, struct Sprite *); static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent*); static void GetGroundEffectFlags_Reflection(struct ObjectEvent*, u32*); static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent*, u32*); @@ -7559,7 +7559,7 @@ static void TryEnableObjectEventAnim(struct ObjectEvent *objectEvent, struct Spr static void UpdateObjectEventVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8096530(objectEvent, sprite); - UpdateEventObjSpriteVisibility(objectEvent, sprite); + UpdateObjEventSpriteVisibility(objectEvent, sprite); } static void sub_8096530(struct ObjectEvent *objectEvent, struct Sprite *sprite) @@ -7594,7 +7594,7 @@ static void sub_8096530(struct ObjectEvent *objectEvent, struct Sprite *sprite) } } -static void UpdateEventObjSpriteVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static void UpdateObjEventSpriteVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->invisible = FALSE; if (objectEvent->invisible || objectEvent->offScreen) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index d553dfb05f..9e23f2a348 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -321,15 +321,15 @@ static u8 ObjectEventCB2_NoMovement2(void) void player_step(u8 direction, u16 newKeys, u16 heldKeys) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - sub_808C280(playerEventObj); + sub_808C280(playerObjEvent); if (gPlayerAvatar.preventStep == FALSE) { Bike_TryAcroBikeHistoryUpdate(newKeys, heldKeys); - if (TryInterruptObjectEventSpecialAnim(playerEventObj, direction) == 0) + if (TryInterruptObjectEventSpecialAnim(playerObjEvent, direction) == 0) { - npc_clear_strange_bits(playerEventObj); + npc_clear_strange_bits(playerObjEvent); DoPlayerAvatarTransition(); if (TryDoMetatileBehaviorForcedMovement() == 0) { @@ -340,16 +340,16 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys) } } -static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerEventObj, u8 direction) +static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerObjEvent, u8 direction) { u8 r5 = direction; u8 r6 = direction; r6++; r6--; - if (ObjectEventIsMovementOverridden(playerEventObj) - && !ObjectEventClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerObjEvent) + && !ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { - u8 heldMovementActionId = ObjectEventGetHeldMovementActionId(playerEventObj); + u8 heldMovementActionId = ObjectEventGetHeldMovementActionId(playerObjEvent); if (heldMovementActionId > MOVEMENT_ACTION_WALK_FAST_RIGHT && heldMovementActionId < MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN) { if (direction == DIR_NONE) @@ -357,15 +357,15 @@ static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerEventO return TRUE; } - if (playerEventObj->movementDirection != r5) + if (playerObjEvent->movementDirection != r5) { - ObjectEventClearHeldMovement(playerEventObj); + ObjectEventClearHeldMovement(playerObjEvent); return FALSE; } if (!sub_808B028(r6)) { - ObjectEventClearHeldMovement(playerEventObj); + ObjectEventClearHeldMovement(playerObjEvent); return FALSE; } } @@ -425,11 +425,11 @@ static bool8 ForcedMovement_None(void) { if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->facingDirectionLocked = 0; - playerEventObj->enableAnim = 1; - SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection); + playerObjEvent->facingDirectionLocked = 0; + playerObjEvent->enableAnim = 1; + SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection); gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_6; } return FALSE; @@ -467,10 +467,10 @@ static u8 DoForcedMovement(u8 direction, void (*b)(u8)) static u8 DoForcedMovementInCurrentDirection(void (*a)(u8)) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->disableAnim = 1; - return DoForcedMovement(playerEventObj->movementDirection, a); + playerObjEvent->disableAnim = 1; + return DoForcedMovement(playerObjEvent->movementDirection, a); } static bool8 ForcedMovement_Slip(void) @@ -520,10 +520,10 @@ static bool8 ForcedMovement_PushedEastByCurrent(void) u8 ForcedMovement_Slide(u8 direction, void (*b)(u8)) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->disableAnim = 1; - playerEventObj->facingDirectionLocked = 1; + playerObjEvent->disableAnim = 1; + playerObjEvent->facingDirectionLocked = 1; return DoForcedMovement(direction, b); } @@ -561,12 +561,12 @@ static bool8 ForcedMovement_0xBC(void) static bool8 ForcedMovement_MuddySlope(void) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (playerEventObj->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3) + if (playerObjEvent->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3) { Bike_UpdateBikeCounterSpeed(0); - playerEventObj->facingDirectionLocked = 1; + playerObjEvent->facingDirectionLocked = 1; return DoForcedMovement(1, PlayerGoSpeed2); } else @@ -657,23 +657,23 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) static u8 CheckForPlayerAvatarCollision(u8 direction) { s16 x, y; - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - x = playerEventObj->currentCoords.x; - y = playerEventObj->currentCoords.y; + x = playerObjEvent->currentCoords.x; + y = playerObjEvent->currentCoords.y; MoveCoords(direction, &x, &y); - return CheckForObjectEventCollision(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); + return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); } static u8 sub_808B028(u8 direction) { s16 x, y; - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - x = playerEventObj->currentCoords.x; - y = playerEventObj->currentCoords.y; + x = playerObjEvent->currentCoords.x; + y = playerObjEvent->currentCoords.y; MoveCoords(direction, &x, &y); - return sub_808B164(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); + return sub_808B164(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); } u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior) @@ -1208,10 +1208,10 @@ void sub_808BCE8(void) void sub_808BCF4(void) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - npc_clear_strange_bits(playerEventObj); - SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection); + npc_clear_strange_bits(playerObjEvent); + SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection); if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) { Bike_HandleBumpySlopeJump(); @@ -1307,12 +1307,12 @@ bool8 IsPlayerSurfingNorth(void) bool8 IsPlayerFacingSurfableFishableWater(void) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - s16 x = playerEventObj->currentCoords.x; - s16 y = playerEventObj->currentCoords.y; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + s16 x = playerObjEvent->currentCoords.x; + s16 y = playerObjEvent->currentCoords.y; - MoveCoords(playerEventObj->facingDirection, &x, &y); - if (GetCollisionAtCoords(playerEventObj, x, y, playerEventObj->facingDirection) == COLLISION_ELEVATION_MISMATCH + MoveCoords(playerObjEvent->facingDirection, &x, &y); + if (GetCollisionAtCoords(playerObjEvent, x, y, playerObjEvent->facingDirection) == COLLISION_ELEVATION_MISMATCH && PlayerGetZCoord() == 3 && MetatileBehavior_IsSurfableFishableWater(MapGridGetMetatileBehaviorAt(x, y))) return TRUE; @@ -1366,23 +1366,23 @@ void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b) void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) { - struct ObjectEventTemplate playerEventObjTemplate; + struct ObjectEventTemplate playerObjEventTemplate; u8 objectEventId; struct ObjectEvent *objectEvent; - playerEventObjTemplate.localId = OBJ_EVENT_ID_PLAYER; - playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); - playerEventObjTemplate.x = x - 7; - playerEventObjTemplate.y = y - 7; - playerEventObjTemplate.elevation = 0; - playerEventObjTemplate.movementType = MOVEMENT_TYPE_PLAYER; - playerEventObjTemplate.movementRangeX = 0; - playerEventObjTemplate.movementRangeY = 0; - playerEventObjTemplate.trainerType = 0; - playerEventObjTemplate.trainerRange_berryTreeId = 0; - playerEventObjTemplate.script = NULL; - playerEventObjTemplate.flagId = 0; - objectEventId = SpawnSpecialObjectEvent(&playerEventObjTemplate); + playerObjEventTemplate.localId = OBJ_EVENT_ID_PLAYER; + playerObjEventTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); + playerObjEventTemplate.x = x - 7; + playerObjEventTemplate.y = y - 7; + playerObjEventTemplate.elevation = 0; + playerObjEventTemplate.movementType = MOVEMENT_TYPE_PLAYER; + playerObjEventTemplate.movementRangeX = 0; + playerObjEventTemplate.movementRangeY = 0; + playerObjEventTemplate.trainerType = 0; + playerObjEventTemplate.trainerRange_berryTreeId = 0; + playerObjEventTemplate.script = NULL; + playerObjEventTemplate.flagId = 0; + objectEventId = SpawnSpecialObjectEvent(&playerObjEventTemplate); objectEvent = &gObjectEvents[objectEventId]; objectEvent->isPlayer = 1; objectEvent->warpArrowSpriteId = CreateWarpArrowSprite(); @@ -1642,29 +1642,29 @@ static void CreateStopSurfingTask(u8 direction) static void Task_StopSurfingInit(u8 taskId) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (ObjectEventIsMovementOverridden(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerObjEvent)) { - if (!ObjectEventClearHeldMovementIfFinished(playerEventObj)) + if (!ObjectEventClearHeldMovementIfFinished(playerObjEvent)) return; } - sub_81555AC(playerEventObj->fieldEffectSpriteId, 2); - ObjectEventSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); + sub_81555AC(playerObjEvent->fieldEffectSpriteId, 2); + ObjectEventSetHeldMovement(playerObjEvent, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); gTasks[taskId].func = Task_WaitStopSurfing; } static void Task_WaitStopSurfing(u8 taskId) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (ObjectEventClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { - ObjectEventSetGraphicsId(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); - ObjectEventSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection)); + ObjectEventSetGraphicsId(playerObjEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + ObjectEventSetHeldMovement(playerObjEvent, GetFaceDirectionMovementAction(playerObjEvent->facingDirection)); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - DestroySprite(&gSprites[playerEventObj->fieldEffectSpriteId]); + DestroySprite(&gSprites[playerObjEvent->fieldEffectSpriteId]); DestroyTask(taskId); } } @@ -1729,17 +1729,17 @@ static bool8 Fishing1(struct Task *task) static bool8 Fishing2(struct Task *task) { - struct ObjectEvent *playerEventObj; + struct ObjectEvent *playerObjEvent; const s16 arr1[] = {1, 1, 1}; const s16 arr2[] = {1, 3, 6}; task->tRoundsPlayed = 0; task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]); task->tPlayerGfxId = gObjectEvents[gPlayerAvatar.objectEventId].graphicsId; - playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - ObjectEventClearHeldMovementIfActive(playerEventObj); - playerEventObj->enableAnim = 1; - sub_808C15C(playerEventObj->facingDirection); + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(playerObjEvent); + playerObjEvent->enableAnim = 1; + sub_808C15C(playerObjEvent->facingDirection); task->tStep++; return FALSE; } @@ -1928,10 +1928,10 @@ static bool8 Fishing11(struct Task *task) { if (!IsTextPrinterActive(0)) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - ObjectEventSetGraphicsId(playerEventObj, task->tPlayerGfxId); - ObjectEventTurn(playerEventObj, playerEventObj->movementDirection); + ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId); + ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; @@ -1988,10 +1988,10 @@ static bool8 Fishing15(struct Task *task) AlignFishingAnimationFrames(); if (gSprites[gPlayerAvatar.spriteId].animEnded) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - ObjectEventSetGraphicsId(playerEventObj, task->tPlayerGfxId); - ObjectEventTurn(playerEventObj, playerEventObj->movementDirection); + ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId); + ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; diff --git a/src/field_specials.c b/src/field_specials.c index f83190613a..319004add4 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3455,7 +3455,7 @@ static void ChangeDeoxysRockLevel(u8 rockLevel) gFieldEffectArguments[5] = 5; FieldEffectStart(FLDEFF_MOVE_DEOXYS_ROCK); - Overworld_SetEventObjTemplateCoords(1, sDeoxysRockCoords[rockLevel][0], sDeoxysRockCoords[rockLevel][1]); + Overworld_SetObjEventTemplateCoords(1, sDeoxysRockCoords[rockLevel][0], sDeoxysRockCoords[rockLevel][1]); } static void WaitForDeoxysRockMovement(u8 taskId) diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 8bb10685e9..a1f8d14fa3 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -1229,27 +1229,27 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!ObjectEventIsMovementOverridden(playerEventObj) - || ObjectEventClearHeldMovementIfFinished(playerEventObj)) + if (!ObjectEventIsMovementOverridden(playerObjEvent) + || ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { sub_808C228(GetPlayerFacingDirection()); - ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); gTasks[taskId].func = Task_WateringBerryTreeAnim_2; } } static void Task_WateringBerryTreeAnim_2(u8 taskId) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (ObjectEventClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) - ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); else gTasks[taskId].func = Task_WateringBerryTreeAnim_3; diff --git a/src/frontier_util.c b/src/frontier_util.c index e102c139a9..a29714a327 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -663,7 +663,7 @@ static const struct WindowTemplate gUnknown_08611C84 = }; // Second field - whether the character is female. -static const u8 sFacilityToBrainEventObjGfx[][2] = +static const u8 sFacilityToBrainObjEventGfx[][2] = { [FRONTIER_FACILITY_TOWER] = {OBJ_EVENT_GFX_ANABEL, TRUE}, [FRONTIER_FACILITY_DOME] = {OBJ_EVENT_GFX_TUCKER, FALSE}, @@ -2201,7 +2201,7 @@ static void sub_81A447C(void) static void SetFacilityBrainObjectEvent(void) { - SetFrontierBrainEventObjGfx(VarGet(VAR_FRONTIER_FACILITY)); + SetFrontierBrainObjEventGfx(VarGet(VAR_FRONTIER_FACILITY)); } // Battle Frontier Ranking Hall records. @@ -2460,13 +2460,13 @@ void CopyFrontierBrainTrainerName(u8 *dst) bool8 IsFrontierBrainFemale(void) { s32 facility = VarGet(VAR_FRONTIER_FACILITY); - return sFacilityToBrainEventObjGfx[facility][1]; + return sFacilityToBrainObjEventGfx[facility][1]; } -void SetFrontierBrainEventObjGfx_2(void) +void SetFrontierBrainObjEventGfx_2(void) { s32 facility = VarGet(VAR_FRONTIER_FACILITY); - VarSet(VAR_OBJ_GFX_ID_0, sFacilityToBrainEventObjGfx[facility][0]); + VarSet(VAR_OBJ_GFX_ID_0, sFacilityToBrainObjEventGfx[facility][0]); } #define FRONTIER_BRAIN_OTID 61226 @@ -2766,10 +2766,10 @@ u16 GetFrontierBrainMonSpecies(u8 monId) return sFrontierBrainsMons[facility][symbol][monId].species; } -void SetFrontierBrainEventObjGfx(u8 facility) +void SetFrontierBrainObjEventGfx(u8 facility) { gTrainerBattleOpponent_A = TRAINER_FRONTIER_BRAIN; - VarSet(VAR_OBJ_GFX_ID_0, sFacilityToBrainEventObjGfx[facility][0]); + VarSet(VAR_OBJ_GFX_ID_0, sFacilityToBrainObjEventGfx[facility][0]); } u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId) diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 9ebd1236da..8fea7c0989 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -137,7 +137,7 @@ void SetMauvilleOldMan(void) SetupGiddy(); break; } - ScrSpecial_SetMauvilleOldManEventObjGfx(); + ScrSpecial_SetMauvilleOldManObjEventGfx(); } u8 GetCurrentMauvilleOldMan(void) @@ -407,7 +407,7 @@ void ResetMauvilleOldManFlag(void) case MAUVILLE_MAN_GIDDY: break; } - ScrSpecial_SetMauvilleOldManEventObjGfx(); + ScrSpecial_SetMauvilleOldManObjEventGfx(); } @@ -674,7 +674,7 @@ static void Task_BardSong(u8 taskId) RunTextPrintersAndIsPrinter0Active(); } -void ScrSpecial_SetMauvilleOldManEventObjGfx(void) +void ScrSpecial_SetMauvilleOldManObjEventGfx(void) { VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BARD); } diff --git a/src/overworld.c b/src/overworld.c index a3a1ba22ea..fb1f1f977e 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -141,7 +141,7 @@ static void ResetAllTradingStates(void); static void UpdateHeldKeyCode(u16); static void UpdateAllLinkPlayers(u16*, s32); static u8 FlipVerticalAndClearForced(u8 a1, u8 a2); -static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y); +static u8 LinkPlayerDetectCollision(u8 selfObjEventId, u8 a2, s16 x, s16 y); static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion); static void GetLinkPlayerCoords(u8 linkPlayerId, u16 *x, u16 *y); static u8 GetLinkPlayerFacingDirection(u8 linkPlayerId); @@ -157,7 +157,7 @@ static void sub_808780C(u8 linkPlayerId); static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId); static void sub_8087584(void); static u32 GetLinkSendQueueLength(void); -static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerEventObj); +static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerObjEvent); static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *a1); static u16 GetDirectionForEventScript(const u8 *script); static void sub_8087510(void); @@ -493,7 +493,7 @@ void ApplyNewEncryptionKeyToGameStats(u32 newKey) ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->gameStats[i], newKey); } -void LoadEventObjTemplatesFromHeader(void) +void LoadObjEventTemplatesFromHeader(void) { // Clear map object templates CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates)); @@ -504,7 +504,7 @@ void LoadEventObjTemplatesFromHeader(void) gMapHeader.events->objectEventCount * sizeof(struct ObjectEventTemplate)); } -void LoadSaveblockEventObjScripts(void) +void LoadSaveblockObjEventScripts(void) { struct ObjectEventTemplate *mapHeaderObjTemplates = gMapHeader.events->objectEvents; struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; @@ -514,7 +514,7 @@ void LoadSaveblockEventObjScripts(void) savObjTemplates[i].script = mapHeaderObjTemplates[i].script; } -void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y) +void Overworld_SetObjEventTemplateCoords(u8 localId, s16 x, s16 y) { s32 i; struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; @@ -531,7 +531,7 @@ void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y) } } -void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType) +void Overworld_SetObjEventTemplateMovementType(u8 localId, u8 movementType) { s32 i; @@ -814,7 +814,7 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum) ApplyCurrentWarp(); LoadCurrentMapData(); - LoadEventObjTemplatesFromHeader(); + LoadObjEventTemplatesFromHeader(); TrySetMapSaveWarpStatus(); ClearTempFieldEventData(); ResetCyclingRoadChallengeData(); @@ -857,7 +857,7 @@ static void mli0_load_map(u32 a1) else if (InTrainerHill()) LoadTrainerHillObjectEventTemplates(); else - LoadEventObjTemplatesFromHeader(); + LoadObjEventTemplatesFromHeader(); } isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType); @@ -1725,7 +1725,7 @@ void CB2_ContinueSavedGame(void) else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE) LoadTrainerHillFloorObjectEventScripts(); else - LoadSaveblockEventObjScripts(); + LoadSaveblockObjEventScripts(); UnfreezeObjectEvents(); DoTimeBasedEvents(); @@ -2918,9 +2918,9 @@ static u32 GetLinkSendQueueLength(void) return gLink.sendQueue.count; } -static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerEventObj) +static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerObjEvent) { - memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerObjectEvent)); + memset(linkPlayerObjEvent, 0, sizeof(struct LinkPlayerObjectEvent)); } void ClearLinkPlayerObjectEvents(void) @@ -2936,16 +2936,16 @@ static void ZeroObjectEvent(struct ObjectEvent *objEvent) static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 a4) { u8 objEventId = GetFirstInactiveObjectEventId(); - struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; - ZeroLinkPlayerObjectEvent(linkPlayerEventObj); + ZeroLinkPlayerObjectEvent(linkPlayerObjEvent); ZeroObjectEvent(objEvent); - linkPlayerEventObj->active = 1; - linkPlayerEventObj->linkPlayerId = linkPlayerId; - linkPlayerEventObj->objEventId = objEventId; - linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; + linkPlayerObjEvent->active = 1; + linkPlayerObjEvent->linkPlayerId = linkPlayerId; + linkPlayerObjEvent->objEventId = objEventId; + linkPlayerObjEvent->movementMode = MOVEMENT_MODE_FREE; objEvent->active = 1; objEvent->singleMovementActive = a4; @@ -2978,12 +2978,12 @@ static void sub_80877DC(u8 linkPlayerId, u8 a2) static void sub_808780C(u8 linkPlayerId) { - struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; - u8 objEventId = linkPlayerEventObj->objEventId; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerObjEvent->objEventId; struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; if (objEvent->spriteId != MAX_SPRITES) DestroySprite(&gSprites[objEvent->spriteId]); - linkPlayerEventObj->active = 0; + linkPlayerObjEvent->active = 0; objEvent->active = 0; } @@ -3042,11 +3042,11 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) { - struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; - u8 objEventId = linkPlayerEventObj->objEventId; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerObjEvent->objEventId; struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; - if (linkPlayerEventObj->active) + if (linkPlayerObjEvent->active) { if (facing > FACING_FORCED_RIGHT) { @@ -3056,9 +3056,9 @@ static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) { // This is a hack to split this code onto two separate lines, without declaring a local variable. // C++ style inline variables would be nice here. - #define TEMP gLinkPlayerMovementModes[linkPlayerEventObj->movementMode](linkPlayerEventObj, objEvent, facing) + #define TEMP gLinkPlayerMovementModes[linkPlayerObjEvent->movementMode](linkPlayerObjEvent, objEvent, facing) - gMovementStatusHandler[TEMP](linkPlayerEventObj, objEvent); + gMovementStatusHandler[TEMP](linkPlayerObjEvent, objEvent); // Clean up the hack. #undef TEMP @@ -3067,35 +3067,35 @@ static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) } -static u8 MovementEventModeCB_Normal(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) +static u8 MovementEventModeCB_Normal(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, objEvent, a3); + return gLinkPlayerFacingHandlers[a3](linkPlayerObjEvent, objEvent, a3); } -static u8 MovementEventModeCB_Ignored(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) +static u8 MovementEventModeCB_Ignored(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { return FACING_UP; } // Duplicate Function -static u8 MovementEventModeCB_Normal_2(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) +static u8 MovementEventModeCB_Normal_2(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, objEvent, a3); + return gLinkPlayerFacingHandlers[a3](linkPlayerObjEvent, objEvent, a3); } -static bool8 FacingHandler_DoNothing(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) +static bool8 FacingHandler_DoNothing(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { return FALSE; } -static bool8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) +static bool8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { s16 x, y; objEvent->range.as_byte = FlipVerticalAndClearForced(a3, objEvent->range.as_byte); ObjectEventMoveDestCoords(objEvent, objEvent->range.as_byte, &x, &y); - if (LinkPlayerDetectCollision(linkPlayerEventObj->objEventId, objEvent->range.as_byte, x, y)) + if (LinkPlayerDetectCollision(linkPlayerObjEvent->objEventId, objEvent->range.as_byte, x, y)) { return FALSE; } @@ -3108,27 +3108,27 @@ static bool8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *linkPlayer } } -static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) +static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { objEvent->range.as_byte = FlipVerticalAndClearForced(a3, objEvent->range.as_byte); return FALSE; } // This is called every time a free movement happens. Most of the time it's a No-Op. -static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent) +static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent) { - linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; + linkPlayerObjEvent->movementMode = MOVEMENT_MODE_FREE; } -static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent) +static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent) { objEvent->directionSequenceIndex--; - linkPlayerEventObj->movementMode = MOVEMENT_MODE_FROZEN; + linkPlayerObjEvent->movementMode = MOVEMENT_MODE_FROZEN; MoveCoords(objEvent->range.as_byte, &objEvent->initialCoords.x, &objEvent->initialCoords.y); if (!objEvent->directionSequenceIndex) { ShiftStillObjectEventCoords(objEvent); - linkPlayerEventObj->movementMode = MOVEMENT_MODE_SCRIPTED; + linkPlayerObjEvent->movementMode = MOVEMENT_MODE_SCRIPTED; } } @@ -3155,12 +3155,12 @@ static u8 FlipVerticalAndClearForced(u8 newFacing, u8 oldFacing) return oldFacing; } -static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) +static u8 LinkPlayerDetectCollision(u8 selfObjEventId, u8 a2, s16 x, s16 y) { u8 i; for (i = 0; i < 16; i++) { - if (i != selfEventObjId) + if (i != selfObjEventId) { if ((gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y) || (gObjectEvents[i].previousCoords.x == x && gObjectEvents[i].previousCoords.y == y)) @@ -3174,12 +3174,12 @@ static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) { - struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; - u8 objEventId = linkPlayerEventObj->objEventId; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerObjEvent->objEventId; struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; struct Sprite *sprite; - if (linkPlayerEventObj->active) + if (linkPlayerObjEvent->active) { switch (gameVersion) { @@ -3205,14 +3205,14 @@ static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) static void SpriteCB_LinkPlayer(struct Sprite *sprite) { - struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[sprite->data[0]]; - struct ObjectEvent *objEvent = &gObjectEvents[linkPlayerEventObj->objEventId]; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[sprite->data[0]]; + struct ObjectEvent *objEvent = &gObjectEvents[linkPlayerObjEvent->objEventId]; sprite->pos1.x = objEvent->initialCoords.x; sprite->pos1.y = objEvent->initialCoords.y; SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1); sprite->oam.priority = ZCoordToPriority(objEvent->previousElevation); - if (!linkPlayerEventObj->movementMode != MOVEMENT_MODE_FREE) + if (!linkPlayerObjEvent->movementMode != MOVEMENT_MODE_FREE) StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objEvent->range.as_byte)); else StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(objEvent->range.as_byte)); diff --git a/src/scrcmd.c b/src/scrcmd.c index f164891fe1..07a68a5538 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1100,7 +1100,7 @@ bool8 ScrCmd_setobjectxyperm(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetEventObjTemplateCoords(localId, x, y); + Overworld_SetObjEventTemplateCoords(localId, x, y); return FALSE; } @@ -1177,7 +1177,7 @@ bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 movementType = ScriptReadByte(ctx); - Overworld_SetEventObjTemplateMovementType(localId, movementType); + Overworld_SetObjEventTemplateMovementType(localId, movementType); return FALSE; } diff --git a/src/script_movement.c b/src/script_movement.c index 292b1230c6..d7addb2b72 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -118,12 +118,12 @@ static u8 GetMovementScriptIdFromObjectEventId(u8 taskId, u8 objEventId) return OBJECT_EVENTS_COUNT; } -static void LoadObjectEventIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pEventObjId) +static void LoadObjectEventIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pObjEventId) { u8 i; - *pEventObjId = (u8 *)&gTasks[taskId].data[1]; - for (i = 0; i < moveScrId; i++, (*pEventObjId)++) + *pObjEventId = (u8 *)&gTasks[taskId].data[1]; + for (i = 0; i < moveScrId; i++, (*pObjEventId)++) ; } @@ -184,14 +184,14 @@ static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 objEventId static void ScriptMovement_UnfreezeActiveObjects(u8 taskId) { - u8 *pEventObjId; + u8 *pObjEventId; u8 i; - pEventObjId = (u8 *)&gTasks[taskId].data[1]; - for (i = 0; i < OBJECT_EVENTS_COUNT; i++, pEventObjId++) + pObjEventId = (u8 *)&gTasks[taskId].data[1]; + for (i = 0; i < OBJECT_EVENTS_COUNT; i++, pObjEventId++) { - if (*pEventObjId != 0xFF) - UnfreezeObjectEvent(&gObjectEvents[*pEventObjId]); + if (*pObjEventId != 0xFF) + UnfreezeObjectEvent(&gObjectEvents[*pObjEventId]); } } From 570881b1196a0b327a49a544282a325642c5ce10 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 21 Nov 2019 00:44:55 -0500 Subject: [PATCH 05/13] Rename event_object directories --- .../palettes/event_object_palette_00.pal | 0 .../palettes/event_object_palette_01.pal | 0 .../palettes/event_object_palette_02.pal | 0 .../palettes/event_object_palette_03.pal | 0 .../palettes/event_object_palette_04.pal | 0 .../palettes/event_object_palette_05.pal | 0 .../palettes/event_object_palette_06.pal | 0 .../palettes/event_object_palette_07.pal | 0 .../palettes/event_object_palette_08.pal | 0 .../palettes/event_object_palette_09.pal | 0 .../palettes/event_object_palette_10.pal | 0 .../palettes/event_object_palette_11.pal | 0 .../palettes/event_object_palette_12.pal | 0 .../palettes/event_object_palette_13.pal | 0 .../palettes/event_object_palette_14.pal | 0 .../palettes/event_object_palette_15.pal | 0 .../palettes/event_object_palette_16.pal | 0 .../palettes/event_object_palette_17.pal | 0 .../palettes/event_object_palette_18.pal | 0 .../palettes/event_object_palette_19.pal | 0 .../palettes/event_object_palette_20.pal | 0 .../palettes/event_object_palette_21.pal | 0 .../palettes/event_object_palette_22.pal | 0 .../palettes/event_object_palette_23.pal | 0 .../palettes/event_object_palette_24.pal | 0 .../palettes/event_object_palette_25.pal | 0 .../palettes/event_object_palette_26.pal | 0 .../palettes/event_object_palette_27.pal | 0 .../palettes/event_object_palette_28.pal | 0 .../palettes/event_object_palette_29.pal | 0 .../palettes/event_object_palette_30.pal | 0 .../palettes/event_object_palette_31.pal | 0 .../palettes/event_object_palette_32.pal | 0 .../palettes/event_object_palette_33.pal | 0 .../palettes/event_object_palette_34.pal | 0 .../field_effect_object_palette_00.pal | 0 .../field_effect_object_palette_01.pal | 0 .../field_effect_object_palette_02.pal | 0 .../field_effect_object_palette_03.pal | 0 .../field_effect_object_palette_04.pal | 0 .../field_effect_object_palette_05.pal | 0 .../field_effect_object_palette_06.pal | 0 .../field_effect_object_palette_07.pal | 0 .../field_effect_object_palette_08.pal | 0 .../field_effect_object_palette_10.pal | 0 .../palettes/unused_palette.pal | 0 .../pics/berry_trees/aguav.png | Bin .../pics/berry_trees/aspear.png | Bin .../pics/berry_trees/cheri.png | Bin .../pics/berry_trees/chesto.png | Bin .../pics/berry_trees/cornn.png | Bin .../pics/berry_trees/dirt_pile.png | Bin .../pics/berry_trees/durin.png | Bin .../pics/berry_trees/figy.png | Bin .../pics/berry_trees/grepa.png | Bin .../pics/berry_trees/hondew.png | Bin .../pics/berry_trees/iapapa.png | Bin .../pics/berry_trees/kelpsy.png | Bin .../pics/berry_trees/lansat.png | Bin .../pics/berry_trees/leppa.png | Bin .../pics/berry_trees/liechi.png | Bin .../pics/berry_trees/lum.png | Bin .../pics/berry_trees/mago.png | Bin .../pics/berry_trees/nomel.png | Bin .../pics/berry_trees/oran.png | Bin .../pics/berry_trees/pamtre.png | Bin .../pics/berry_trees/pecha.png | Bin .../pics/berry_trees/persim.png | Bin .../pics/berry_trees/pomeg.png | Bin .../pics/berry_trees/rabuta.png | Bin .../pics/berry_trees/rawst.png | Bin .../pics/berry_trees/razz.png | Bin .../pics/berry_trees/sitrus.png | Bin .../pics/berry_trees/spelon.png | Bin .../pics/berry_trees/sprout.png | Bin .../pics/berry_trees/tamato.png | Bin .../pics/berry_trees/wepear.png | Bin .../pics/berry_trees/wiki.png | Bin .../pics/cushions/ball_cushion.png | Bin .../pics/cushions/diamond_cushion.png | Bin .../pics/cushions/fire_cushion.png | Bin .../pics/cushions/grass_cushion.png | Bin .../pics/cushions/kiss_cushion.png | Bin .../pics/cushions/pika_cushion.png | Bin .../pics/cushions/round_cushion.png | Bin .../pics/cushions/spin_cushion.png | Bin .../pics/cushions/water_cushion.png | Bin .../pics/cushions/zigzag_cushion.png | Bin .../pics/dolls/azurill_doll.png | Bin .../pics/dolls/baltoy_doll.png | Bin .../pics/dolls/big_blastoise_doll.png | Bin .../pics/dolls/big_charizard_doll.png | Bin .../pics/dolls/big_lapras_doll.png | Bin .../pics/dolls/big_regice_doll.png | Bin .../pics/dolls/big_regirock_doll.png | Bin .../pics/dolls/big_registeel_doll.png | Bin .../pics/dolls/big_rhydon_doll.png | Bin .../pics/dolls/big_snorlax_doll.png | Bin .../pics/dolls/big_venusaur_doll.png | Bin .../pics/dolls/big_wailmer_doll.png | Bin .../pics/dolls/chikorita_doll.png | Bin .../pics/dolls/clefairy_doll.png | Bin .../pics/dolls/cyndaquil_doll.png | Bin .../pics/dolls/ditto_doll.png | Bin .../pics/dolls/duskull_doll.png | Bin .../pics/dolls/gulpin_doll.png | Bin .../pics/dolls/jigglypuff_doll.png | Bin .../pics/dolls/kecleon_doll.png | Bin .../pics/dolls/lotad_doll.png | Bin .../pics/dolls/marill_doll.png | Bin .../pics/dolls/meowth_doll.png | Bin .../pics/dolls/mudkip_doll.png | Bin .../pics/dolls/pichu_doll.png | Bin .../pics/dolls/pikachu_doll.png | Bin .../pics/dolls/seedot_doll.png | Bin .../pics/dolls/skitty_doll.png | Bin .../pics/dolls/smoochum_doll.png | Bin .../pics/dolls/swablu_doll.png | Bin .../pics/dolls/togepi_doll.png | Bin .../pics/dolls/torchic_doll.png | Bin .../pics/dolls/totodile_doll.png | Bin .../pics/dolls/treecko_doll.png | Bin .../pics/dolls/unused_magnemite_doll.png | Bin .../pics/dolls/unused_natu_doll.png | Bin .../pics/dolls/unused_pikachu_doll.png | Bin .../pics/dolls/unused_porygon2_doll.png | Bin .../pics/dolls/unused_squirtle_doll.png | Bin .../pics/dolls/unused_wooper_doll.png | Bin .../pics/dolls/wynaut_doll.png | Bin .../pics/effects/arrow.png | Bin .../pics/effects/ash.png | Bin .../effects/berry_tree_growth_sparkle.png | Bin .../pics/effects/bike_hop_big_splash.png | Bin .../pics/effects/bike_hop_small_splash.png | Bin .../pics/effects/bike_hop_tall_grass.png | Bin .../pics/effects/bike_tire_tracks.png | Bin .../pics/effects/bird.png | Bin .../pics/effects/bubbles.png | Bin .../pics/effects/cut_grass.png | Bin .../pics/effects/deep_sand_footprints.png | Bin .../pics/effects/ground_impact_dust.png | Bin .../pics/effects/hot_springs_water.png | Bin .../pics/effects/jump_out_of_ash.png | Bin .../pics/effects/long_grass.png | Bin .../pics/effects/mountain_disguise.png | Bin .../pics/effects/ripple.png | Bin .../effects/sand_disguise_placeholder.png | Bin .../pics/effects/sand_footprints.png | Bin .../pics/effects/shadow_extra_large.png | Bin .../pics/effects/shadow_large.png | Bin .../pics/effects/shadow_medium.png | Bin .../pics/effects/shadow_small.png | Bin .../pics/effects/short_grass.png | Bin .../pics/effects/splash.png | Bin .../pics/effects/surf_blob.png | Bin .../pics/effects/tall_grass.png | Bin .../pics/effects/tree_disguise.png | Bin .../pics/effects/unknown_16.png | Bin .../pics/effects/unknown_17.png | Bin .../pics/effects/unknown_18.png | Bin .../pics/effects/unknown_19.png | Bin .../pics/effects/unknown_20.png | Bin .../pics/effects/unknown_29.png | Bin .../pics/effects/unknown_33.png | Bin .../pics/effects/unknown_35.png | Bin .../pics/effects/unused_grass.png | Bin .../pics/misc/birchs_bag.png | Bin .../pics/misc/birth_island_stone.png | Bin .../pics/misc/breakable_rock.png | Bin .../pics/misc/cable_car.png | Bin .../pics/misc/cuttable_tree.png | Bin .../pics/misc/fossil.png | Bin .../pics/misc/item_ball.png | Bin .../pics/misc/moving_box.png | Bin .../pics/misc/mr_brineys_boat.png | Bin .../pics/misc/pushable_boulder.png | Bin .../pics/misc/ss_tidal.png | Bin .../pics/misc/statue.png | Bin .../pics/misc/submarine_shadow.png | Bin .../pics/misc/truck.png | Bin .../pics/people/artist.png | Bin .../pics/people/beauty.png | Bin .../pics/people/black_belt.png | Bin .../pics/people/boy_1.png | Bin .../pics/people/boy_2.png | Bin .../pics/people/boy_3.png | Bin .../pics/people/brendan/acro_bike.png | Bin .../pics/people/brendan/decorating.png | Bin .../pics/people/brendan/field_move.png | Bin .../pics/people/brendan/fishing.png | Bin .../pics/people/brendan/mach_bike.png | Bin .../pics/people/brendan/running.png | Bin .../pics/people/brendan/surfing.png | Bin .../pics/people/brendan/underwater.png | Bin .../pics/people/brendan/walking.png | Bin .../pics/people/brendan/watering.png | Bin .../pics/people/bug_catcher.png | Bin .../pics/people/cameraman.png | Bin .../pics/people/camper.png | Bin .../pics/people/contest_judge.png | Bin .../pics/people/cook.png | Bin .../pics/people/cycling_triathlete_f.png | Bin .../pics/people/cycling_triathlete_m.png | Bin .../pics/people/devon_employee.png | Bin .../pics/people/elite_four/drake.png | Bin .../pics/people/elite_four/glacia.png | Bin .../pics/people/elite_four/phoebe.png | Bin .../pics/people/elite_four/sidney.png | Bin .../pics/people/expert_f.png | Bin .../pics/people/expert_m.png | Bin .../pics/people/fat_man.png | Bin .../pics/people/fisherman.png | Bin .../pics/people/frontier_brains/anabel.png | Bin .../pics/people/frontier_brains/brandon.png | Bin .../pics/people/frontier_brains/greta.png | Bin .../pics/people/frontier_brains/lucy.png | Bin .../pics/people/frontier_brains/noland.png | Bin .../pics/people/frontier_brains/spenser.png | Bin .../pics/people/frontier_brains/tucker.png | Bin .../pics/people/gameboy_kid.png | Bin .../pics/people/gentleman.png | Bin .../pics/people/girl_1.png | Bin .../pics/people/girl_2.png | Bin .../pics/people/girl_3.png | Bin .../pics/people/gym_leaders/brawly.png | Bin .../pics/people/gym_leaders/flannery.png | Bin .../pics/people/gym_leaders/juan.png | Bin .../pics/people/gym_leaders/liza.png | Bin .../pics/people/gym_leaders/norman.png | Bin .../pics/people/gym_leaders/roxanne.png | Bin .../pics/people/gym_leaders/tate.png | Bin .../pics/people/gym_leaders/wattson.png | Bin .../pics/people/gym_leaders/winona.png | Bin .../pics/people/hex_maniac.png | Bin .../pics/people/hiker.png | Bin .../pics/people/hot_springs_old_woman.png | Bin .../pics/people/lass.png | Bin .../pics/people/leaf.png | Bin .../pics/people/link_receptionist.png | Bin .../pics/people/little_boy.png | Bin .../pics/people/little_girl.png | Bin .../pics/people/man_1.png | Bin .../pics/people/man_2.png | Bin .../pics/people/man_3.png | Bin .../pics/people/man_4.png | Bin .../pics/people/man_5.png | Bin .../pics/people/maniac.png | Bin .../pics/people/mart_employee.png | Bin .../pics/people/mauville_old_man_1.png | Bin .../pics/people/mauville_old_man_2.png | Bin .../pics/people/may/acro_bike.png | Bin .../pics/people/may/decorating.png | Bin .../pics/people/may/field_move.png | Bin .../pics/people/may/fishing.png | Bin .../pics/people/may/mach_bike.png | Bin .../pics/people/may/running.png | Bin .../pics/people/may/surfing.png | Bin .../pics/people/may/underwater.png | Bin .../pics/people/may/walking.png | Bin .../pics/people/may/watering.png | Bin .../pics/people/mom.png | Bin .../pics/people/mystery_event_deliveryman.png | Bin .../pics/people/ninja_boy.png | Bin .../pics/people/nurse.png | Bin .../pics/people/old_man.png | Bin .../pics/people/old_woman.png | Bin .../pics/people/picnicker.png | Bin .../pics/people/pokefan_f.png | Bin .../pics/people/pokefan_m.png | Bin .../pics/people/prof_birch.png | Bin .../pics/people/psychic_m.png | Bin .../pics/people/quinty_plump.png | Bin .../pics/people/red.png | Bin .../pics/people/reporter_f.png | Bin .../pics/people/reporter_m.png | Bin .../pics/people/rich_boy.png | Bin .../pics/people/rooftop_sale_woman.png | Bin .../pics/people/rs_little_boy.png | Bin .../people/ruby_sapphire_brendan/running.png | Bin .../people/ruby_sapphire_brendan/walking.png | Bin .../pics/people/ruby_sapphire_may/running.png | Bin .../pics/people/ruby_sapphire_may/walking.png | Bin .../pics/people/running_triathlete_f.png | Bin .../pics/people/running_triathlete_m.png | Bin .../pics/people/sailor.png | Bin .../pics/people/school_kid_m.png | Bin .../pics/people/scientist_1.png | Bin .../pics/people/scientist_2.png | Bin .../pics/people/scott.png | Bin .../pics/people/steven.png | Bin .../pics/people/swimmer_f.png | Bin .../pics/people/swimmer_m.png | Bin .../pics/people/teala.png | Bin .../pics/people/team_aqua/aqua_member_f.png | Bin .../pics/people/team_aqua/aqua_member_m.png | Bin .../pics/people/team_aqua/archie.png | Bin .../pics/people/team_magma/magma_member_f.png | Bin .../pics/people/team_magma/magma_member_m.png | Bin .../pics/people/team_magma/maxie.png | Bin .../pics/people/tuber_f.png | Bin .../pics/people/tuber_m.png | Bin .../pics/people/tuber_m_swimming.png | Bin .../pics/people/twin.png | Bin .../pics/people/union_room_attendant.png | Bin .../pics/people/unused_woman.png | Bin .../pics/people/wallace.png | Bin .../pics/people/wally.png | Bin .../pics/people/woman_1.png | Bin .../pics/people/woman_2.png | Bin .../pics/people/woman_3.png | Bin .../pics/people/woman_4.png | Bin .../pics/people/woman_5.png | Bin .../pics/people/youngster.png | Bin .../pics/pokemon/azumarill.png | Bin .../pics/pokemon/azurill.png | Bin .../pics/pokemon/deoxys.png | Bin .../pics/pokemon/dusclops.png | Bin .../pics/pokemon/enemy_zigzagoon.png | Bin .../pics/pokemon/groudon.png | Bin .../pics/pokemon/ho_oh.png | Bin .../pics/pokemon/kecleon.png | Bin .../pics/pokemon/kirlia.png | Bin .../pics/pokemon/kyogre.png | Bin .../pics/pokemon/latias_latios.png | Bin .../pics/pokemon/lugia.png | Bin .../pics/pokemon/mew.png | Bin .../pics/pokemon/pikachu.png | Bin .../pics/pokemon/poochyena.png | Bin .../pics/pokemon/rayquaza.png | Bin .../pics/pokemon/rayquaza_still.png | Bin .../pics/pokemon/regi.png | Bin .../pics/pokemon/skitty.png | Bin .../pics/pokemon/sudowoodo.png | Bin .../pics/pokemon/vigoroth.png | Bin .../pics/pokemon/wingull.png | Bin .../pics/pokemon/zigzagoon.png | Bin graphics_file_rules.mk | 4 +- spritesheet_rules.mk | 432 +++++++++--------- src/battle_transition.c | 2 +- src/data/event_object/event_object_graphics.h | 362 --------------- .../{event_object => object_event}/base_oam.h | 0 .../berry_tree_graphics_tables.h | 0 .../event_object_anims.h | 0 src/data/object_event/event_object_graphics.h | 362 +++++++++++++++ .../event_object_graphics_info.h | 0 .../event_object_graphics_info_pointers.h | 0 .../event_object_pic_tables.h | 0 .../event_object_subsprites.h | 0 .../field_effect_object_template_pointers.h | 0 .../field_effect_objects.h | 0 .../movement_action_func_tables.h | 0 .../movement_type_func_tables.h | 0 src/event_object_movement.c | 24 +- src/field_effect.c | 4 +- src/fldeff_misc.c | 4 +- 355 files changed, 597 insertions(+), 597 deletions(-) rename graphics/{event_objects => object_events}/palettes/event_object_palette_00.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_01.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_02.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_03.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_04.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_05.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_06.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_07.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_08.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_09.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_10.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_11.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_12.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_13.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_14.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_15.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_16.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_17.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_18.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_19.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_20.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_21.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_22.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_23.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_24.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_25.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_26.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_27.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_28.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_29.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_30.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_31.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_32.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_33.pal (100%) rename graphics/{event_objects => object_events}/palettes/event_object_palette_34.pal (100%) rename graphics/{event_objects => object_events}/palettes/field_effect_object_palette_00.pal (100%) rename graphics/{event_objects => object_events}/palettes/field_effect_object_palette_01.pal (100%) rename graphics/{event_objects => object_events}/palettes/field_effect_object_palette_02.pal (100%) rename graphics/{event_objects => object_events}/palettes/field_effect_object_palette_03.pal (100%) rename graphics/{event_objects => object_events}/palettes/field_effect_object_palette_04.pal (100%) rename graphics/{event_objects => object_events}/palettes/field_effect_object_palette_05.pal (100%) rename graphics/{event_objects => object_events}/palettes/field_effect_object_palette_06.pal (100%) rename graphics/{event_objects => object_events}/palettes/field_effect_object_palette_07.pal (100%) rename graphics/{event_objects => object_events}/palettes/field_effect_object_palette_08.pal (100%) rename graphics/{event_objects => object_events}/palettes/field_effect_object_palette_10.pal (100%) rename graphics/{event_objects => object_events}/palettes/unused_palette.pal (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/aguav.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/aspear.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/cheri.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/chesto.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/cornn.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/dirt_pile.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/durin.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/figy.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/grepa.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/hondew.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/iapapa.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/kelpsy.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/lansat.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/leppa.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/liechi.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/lum.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/mago.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/nomel.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/oran.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/pamtre.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/pecha.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/persim.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/pomeg.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/rabuta.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/rawst.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/razz.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/sitrus.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/spelon.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/sprout.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/tamato.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/wepear.png (100%) rename graphics/{event_objects => object_events}/pics/berry_trees/wiki.png (100%) rename graphics/{event_objects => object_events}/pics/cushions/ball_cushion.png (100%) rename graphics/{event_objects => object_events}/pics/cushions/diamond_cushion.png (100%) rename graphics/{event_objects => object_events}/pics/cushions/fire_cushion.png (100%) rename graphics/{event_objects => object_events}/pics/cushions/grass_cushion.png (100%) rename graphics/{event_objects => object_events}/pics/cushions/kiss_cushion.png (100%) rename graphics/{event_objects => object_events}/pics/cushions/pika_cushion.png (100%) rename graphics/{event_objects => object_events}/pics/cushions/round_cushion.png (100%) rename graphics/{event_objects => object_events}/pics/cushions/spin_cushion.png (100%) rename graphics/{event_objects => object_events}/pics/cushions/water_cushion.png (100%) rename graphics/{event_objects => object_events}/pics/cushions/zigzag_cushion.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/azurill_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/baltoy_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/big_blastoise_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/big_charizard_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/big_lapras_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/big_regice_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/big_regirock_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/big_registeel_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/big_rhydon_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/big_snorlax_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/big_venusaur_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/big_wailmer_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/chikorita_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/clefairy_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/cyndaquil_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/ditto_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/duskull_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/gulpin_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/jigglypuff_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/kecleon_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/lotad_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/marill_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/meowth_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/mudkip_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/pichu_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/pikachu_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/seedot_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/skitty_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/smoochum_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/swablu_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/togepi_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/torchic_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/totodile_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/treecko_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/unused_magnemite_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/unused_natu_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/unused_pikachu_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/unused_porygon2_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/unused_squirtle_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/unused_wooper_doll.png (100%) rename graphics/{event_objects => object_events}/pics/dolls/wynaut_doll.png (100%) rename graphics/{event_objects => object_events}/pics/effects/arrow.png (100%) rename graphics/{event_objects => object_events}/pics/effects/ash.png (100%) rename graphics/{event_objects => object_events}/pics/effects/berry_tree_growth_sparkle.png (100%) rename graphics/{event_objects => object_events}/pics/effects/bike_hop_big_splash.png (100%) rename graphics/{event_objects => object_events}/pics/effects/bike_hop_small_splash.png (100%) rename graphics/{event_objects => object_events}/pics/effects/bike_hop_tall_grass.png (100%) rename graphics/{event_objects => object_events}/pics/effects/bike_tire_tracks.png (100%) rename graphics/{event_objects => object_events}/pics/effects/bird.png (100%) rename graphics/{event_objects => object_events}/pics/effects/bubbles.png (100%) rename graphics/{event_objects => object_events}/pics/effects/cut_grass.png (100%) rename graphics/{event_objects => object_events}/pics/effects/deep_sand_footprints.png (100%) rename graphics/{event_objects => object_events}/pics/effects/ground_impact_dust.png (100%) rename graphics/{event_objects => object_events}/pics/effects/hot_springs_water.png (100%) rename graphics/{event_objects => object_events}/pics/effects/jump_out_of_ash.png (100%) rename graphics/{event_objects => object_events}/pics/effects/long_grass.png (100%) rename graphics/{event_objects => object_events}/pics/effects/mountain_disguise.png (100%) rename graphics/{event_objects => object_events}/pics/effects/ripple.png (100%) rename graphics/{event_objects => object_events}/pics/effects/sand_disguise_placeholder.png (100%) rename graphics/{event_objects => object_events}/pics/effects/sand_footprints.png (100%) rename graphics/{event_objects => object_events}/pics/effects/shadow_extra_large.png (100%) rename graphics/{event_objects => object_events}/pics/effects/shadow_large.png (100%) rename graphics/{event_objects => object_events}/pics/effects/shadow_medium.png (100%) rename graphics/{event_objects => object_events}/pics/effects/shadow_small.png (100%) rename graphics/{event_objects => object_events}/pics/effects/short_grass.png (100%) rename graphics/{event_objects => object_events}/pics/effects/splash.png (100%) rename graphics/{event_objects => object_events}/pics/effects/surf_blob.png (100%) rename graphics/{event_objects => object_events}/pics/effects/tall_grass.png (100%) rename graphics/{event_objects => object_events}/pics/effects/tree_disguise.png (100%) rename graphics/{event_objects => object_events}/pics/effects/unknown_16.png (100%) rename graphics/{event_objects => object_events}/pics/effects/unknown_17.png (100%) rename graphics/{event_objects => object_events}/pics/effects/unknown_18.png (100%) rename graphics/{event_objects => object_events}/pics/effects/unknown_19.png (100%) rename graphics/{event_objects => object_events}/pics/effects/unknown_20.png (100%) rename graphics/{event_objects => object_events}/pics/effects/unknown_29.png (100%) rename graphics/{event_objects => object_events}/pics/effects/unknown_33.png (100%) rename graphics/{event_objects => object_events}/pics/effects/unknown_35.png (100%) rename graphics/{event_objects => object_events}/pics/effects/unused_grass.png (100%) rename graphics/{event_objects => object_events}/pics/misc/birchs_bag.png (100%) rename graphics/{event_objects => object_events}/pics/misc/birth_island_stone.png (100%) rename graphics/{event_objects => object_events}/pics/misc/breakable_rock.png (100%) rename graphics/{event_objects => object_events}/pics/misc/cable_car.png (100%) rename graphics/{event_objects => object_events}/pics/misc/cuttable_tree.png (100%) rename graphics/{event_objects => object_events}/pics/misc/fossil.png (100%) rename graphics/{event_objects => object_events}/pics/misc/item_ball.png (100%) rename graphics/{event_objects => object_events}/pics/misc/moving_box.png (100%) rename graphics/{event_objects => object_events}/pics/misc/mr_brineys_boat.png (100%) rename graphics/{event_objects => object_events}/pics/misc/pushable_boulder.png (100%) rename graphics/{event_objects => object_events}/pics/misc/ss_tidal.png (100%) rename graphics/{event_objects => object_events}/pics/misc/statue.png (100%) rename graphics/{event_objects => object_events}/pics/misc/submarine_shadow.png (100%) rename graphics/{event_objects => object_events}/pics/misc/truck.png (100%) rename graphics/{event_objects => object_events}/pics/people/artist.png (100%) rename graphics/{event_objects => object_events}/pics/people/beauty.png (100%) rename graphics/{event_objects => object_events}/pics/people/black_belt.png (100%) rename graphics/{event_objects => object_events}/pics/people/boy_1.png (100%) rename graphics/{event_objects => object_events}/pics/people/boy_2.png (100%) rename graphics/{event_objects => object_events}/pics/people/boy_3.png (100%) rename graphics/{event_objects => object_events}/pics/people/brendan/acro_bike.png (100%) rename graphics/{event_objects => object_events}/pics/people/brendan/decorating.png (100%) rename graphics/{event_objects => object_events}/pics/people/brendan/field_move.png (100%) rename graphics/{event_objects => object_events}/pics/people/brendan/fishing.png (100%) rename graphics/{event_objects => object_events}/pics/people/brendan/mach_bike.png (100%) rename graphics/{event_objects => object_events}/pics/people/brendan/running.png (100%) rename graphics/{event_objects => object_events}/pics/people/brendan/surfing.png (100%) rename graphics/{event_objects => object_events}/pics/people/brendan/underwater.png (100%) rename graphics/{event_objects => object_events}/pics/people/brendan/walking.png (100%) rename graphics/{event_objects => object_events}/pics/people/brendan/watering.png (100%) rename graphics/{event_objects => object_events}/pics/people/bug_catcher.png (100%) rename graphics/{event_objects => object_events}/pics/people/cameraman.png (100%) rename graphics/{event_objects => object_events}/pics/people/camper.png (100%) rename graphics/{event_objects => object_events}/pics/people/contest_judge.png (100%) rename graphics/{event_objects => object_events}/pics/people/cook.png (100%) rename graphics/{event_objects => object_events}/pics/people/cycling_triathlete_f.png (100%) rename graphics/{event_objects => object_events}/pics/people/cycling_triathlete_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/devon_employee.png (100%) rename graphics/{event_objects => object_events}/pics/people/elite_four/drake.png (100%) rename graphics/{event_objects => object_events}/pics/people/elite_four/glacia.png (100%) rename graphics/{event_objects => object_events}/pics/people/elite_four/phoebe.png (100%) rename graphics/{event_objects => object_events}/pics/people/elite_four/sidney.png (100%) rename graphics/{event_objects => object_events}/pics/people/expert_f.png (100%) rename graphics/{event_objects => object_events}/pics/people/expert_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/fat_man.png (100%) rename graphics/{event_objects => object_events}/pics/people/fisherman.png (100%) rename graphics/{event_objects => object_events}/pics/people/frontier_brains/anabel.png (100%) rename graphics/{event_objects => object_events}/pics/people/frontier_brains/brandon.png (100%) rename graphics/{event_objects => object_events}/pics/people/frontier_brains/greta.png (100%) rename graphics/{event_objects => object_events}/pics/people/frontier_brains/lucy.png (100%) rename graphics/{event_objects => object_events}/pics/people/frontier_brains/noland.png (100%) rename graphics/{event_objects => object_events}/pics/people/frontier_brains/spenser.png (100%) rename graphics/{event_objects => object_events}/pics/people/frontier_brains/tucker.png (100%) rename graphics/{event_objects => object_events}/pics/people/gameboy_kid.png (100%) rename graphics/{event_objects => object_events}/pics/people/gentleman.png (100%) rename graphics/{event_objects => object_events}/pics/people/girl_1.png (100%) rename graphics/{event_objects => object_events}/pics/people/girl_2.png (100%) rename graphics/{event_objects => object_events}/pics/people/girl_3.png (100%) rename graphics/{event_objects => object_events}/pics/people/gym_leaders/brawly.png (100%) rename graphics/{event_objects => object_events}/pics/people/gym_leaders/flannery.png (100%) rename graphics/{event_objects => object_events}/pics/people/gym_leaders/juan.png (100%) rename graphics/{event_objects => object_events}/pics/people/gym_leaders/liza.png (100%) rename graphics/{event_objects => object_events}/pics/people/gym_leaders/norman.png (100%) rename graphics/{event_objects => object_events}/pics/people/gym_leaders/roxanne.png (100%) rename graphics/{event_objects => object_events}/pics/people/gym_leaders/tate.png (100%) rename graphics/{event_objects => object_events}/pics/people/gym_leaders/wattson.png (100%) rename graphics/{event_objects => object_events}/pics/people/gym_leaders/winona.png (100%) rename graphics/{event_objects => object_events}/pics/people/hex_maniac.png (100%) rename graphics/{event_objects => object_events}/pics/people/hiker.png (100%) rename graphics/{event_objects => object_events}/pics/people/hot_springs_old_woman.png (100%) rename graphics/{event_objects => object_events}/pics/people/lass.png (100%) rename graphics/{event_objects => object_events}/pics/people/leaf.png (100%) rename graphics/{event_objects => object_events}/pics/people/link_receptionist.png (100%) rename graphics/{event_objects => object_events}/pics/people/little_boy.png (100%) rename graphics/{event_objects => object_events}/pics/people/little_girl.png (100%) rename graphics/{event_objects => object_events}/pics/people/man_1.png (100%) rename graphics/{event_objects => object_events}/pics/people/man_2.png (100%) rename graphics/{event_objects => object_events}/pics/people/man_3.png (100%) rename graphics/{event_objects => object_events}/pics/people/man_4.png (100%) rename graphics/{event_objects => object_events}/pics/people/man_5.png (100%) rename graphics/{event_objects => object_events}/pics/people/maniac.png (100%) rename graphics/{event_objects => object_events}/pics/people/mart_employee.png (100%) rename graphics/{event_objects => object_events}/pics/people/mauville_old_man_1.png (100%) rename graphics/{event_objects => object_events}/pics/people/mauville_old_man_2.png (100%) rename graphics/{event_objects => object_events}/pics/people/may/acro_bike.png (100%) rename graphics/{event_objects => object_events}/pics/people/may/decorating.png (100%) rename graphics/{event_objects => object_events}/pics/people/may/field_move.png (100%) rename graphics/{event_objects => object_events}/pics/people/may/fishing.png (100%) rename graphics/{event_objects => object_events}/pics/people/may/mach_bike.png (100%) rename graphics/{event_objects => object_events}/pics/people/may/running.png (100%) rename graphics/{event_objects => object_events}/pics/people/may/surfing.png (100%) rename graphics/{event_objects => object_events}/pics/people/may/underwater.png (100%) rename graphics/{event_objects => object_events}/pics/people/may/walking.png (100%) rename graphics/{event_objects => object_events}/pics/people/may/watering.png (100%) rename graphics/{event_objects => object_events}/pics/people/mom.png (100%) rename graphics/{event_objects => object_events}/pics/people/mystery_event_deliveryman.png (100%) rename graphics/{event_objects => object_events}/pics/people/ninja_boy.png (100%) rename graphics/{event_objects => object_events}/pics/people/nurse.png (100%) rename graphics/{event_objects => object_events}/pics/people/old_man.png (100%) rename graphics/{event_objects => object_events}/pics/people/old_woman.png (100%) rename graphics/{event_objects => object_events}/pics/people/picnicker.png (100%) rename graphics/{event_objects => object_events}/pics/people/pokefan_f.png (100%) rename graphics/{event_objects => object_events}/pics/people/pokefan_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/prof_birch.png (100%) rename graphics/{event_objects => object_events}/pics/people/psychic_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/quinty_plump.png (100%) rename graphics/{event_objects => object_events}/pics/people/red.png (100%) rename graphics/{event_objects => object_events}/pics/people/reporter_f.png (100%) rename graphics/{event_objects => object_events}/pics/people/reporter_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/rich_boy.png (100%) rename graphics/{event_objects => object_events}/pics/people/rooftop_sale_woman.png (100%) rename graphics/{event_objects => object_events}/pics/people/rs_little_boy.png (100%) rename graphics/{event_objects => object_events}/pics/people/ruby_sapphire_brendan/running.png (100%) rename graphics/{event_objects => object_events}/pics/people/ruby_sapphire_brendan/walking.png (100%) rename graphics/{event_objects => object_events}/pics/people/ruby_sapphire_may/running.png (100%) rename graphics/{event_objects => object_events}/pics/people/ruby_sapphire_may/walking.png (100%) rename graphics/{event_objects => object_events}/pics/people/running_triathlete_f.png (100%) rename graphics/{event_objects => object_events}/pics/people/running_triathlete_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/sailor.png (100%) rename graphics/{event_objects => object_events}/pics/people/school_kid_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/scientist_1.png (100%) rename graphics/{event_objects => object_events}/pics/people/scientist_2.png (100%) rename graphics/{event_objects => object_events}/pics/people/scott.png (100%) rename graphics/{event_objects => object_events}/pics/people/steven.png (100%) rename graphics/{event_objects => object_events}/pics/people/swimmer_f.png (100%) rename graphics/{event_objects => object_events}/pics/people/swimmer_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/teala.png (100%) rename graphics/{event_objects => object_events}/pics/people/team_aqua/aqua_member_f.png (100%) rename graphics/{event_objects => object_events}/pics/people/team_aqua/aqua_member_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/team_aqua/archie.png (100%) rename graphics/{event_objects => object_events}/pics/people/team_magma/magma_member_f.png (100%) rename graphics/{event_objects => object_events}/pics/people/team_magma/magma_member_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/team_magma/maxie.png (100%) rename graphics/{event_objects => object_events}/pics/people/tuber_f.png (100%) rename graphics/{event_objects => object_events}/pics/people/tuber_m.png (100%) rename graphics/{event_objects => object_events}/pics/people/tuber_m_swimming.png (100%) rename graphics/{event_objects => object_events}/pics/people/twin.png (100%) rename graphics/{event_objects => object_events}/pics/people/union_room_attendant.png (100%) rename graphics/{event_objects => object_events}/pics/people/unused_woman.png (100%) rename graphics/{event_objects => object_events}/pics/people/wallace.png (100%) rename graphics/{event_objects => object_events}/pics/people/wally.png (100%) rename graphics/{event_objects => object_events}/pics/people/woman_1.png (100%) rename graphics/{event_objects => object_events}/pics/people/woman_2.png (100%) rename graphics/{event_objects => object_events}/pics/people/woman_3.png (100%) rename graphics/{event_objects => object_events}/pics/people/woman_4.png (100%) rename graphics/{event_objects => object_events}/pics/people/woman_5.png (100%) rename graphics/{event_objects => object_events}/pics/people/youngster.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/azumarill.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/azurill.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/deoxys.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/dusclops.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/enemy_zigzagoon.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/groudon.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/ho_oh.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/kecleon.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/kirlia.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/kyogre.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/latias_latios.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/lugia.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/mew.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/pikachu.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/poochyena.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/rayquaza.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/rayquaza_still.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/regi.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/skitty.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/sudowoodo.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/vigoroth.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/wingull.png (100%) rename graphics/{event_objects => object_events}/pics/pokemon/zigzagoon.png (100%) delete mode 100755 src/data/event_object/event_object_graphics.h rename src/data/{event_object => object_event}/base_oam.h (100%) rename src/data/{event_object => object_event}/berry_tree_graphics_tables.h (100%) rename src/data/{event_object => object_event}/event_object_anims.h (100%) create mode 100755 src/data/object_event/event_object_graphics.h rename src/data/{event_object => object_event}/event_object_graphics_info.h (100%) rename src/data/{event_object => object_event}/event_object_graphics_info_pointers.h (100%) rename src/data/{event_object => object_event}/event_object_pic_tables.h (100%) rename src/data/{event_object => object_event}/event_object_subsprites.h (100%) rename src/data/{event_object => object_event}/field_effect_object_template_pointers.h (100%) rename src/data/{event_object => object_event}/field_effect_objects.h (100%) rename src/data/{event_object => object_event}/movement_action_func_tables.h (100%) rename src/data/{event_object => object_event}/movement_type_func_tables.h (100%) diff --git a/graphics/event_objects/palettes/event_object_palette_00.pal b/graphics/object_events/palettes/event_object_palette_00.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_00.pal rename to graphics/object_events/palettes/event_object_palette_00.pal diff --git a/graphics/event_objects/palettes/event_object_palette_01.pal b/graphics/object_events/palettes/event_object_palette_01.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_01.pal rename to graphics/object_events/palettes/event_object_palette_01.pal diff --git a/graphics/event_objects/palettes/event_object_palette_02.pal b/graphics/object_events/palettes/event_object_palette_02.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_02.pal rename to graphics/object_events/palettes/event_object_palette_02.pal diff --git a/graphics/event_objects/palettes/event_object_palette_03.pal b/graphics/object_events/palettes/event_object_palette_03.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_03.pal rename to graphics/object_events/palettes/event_object_palette_03.pal diff --git a/graphics/event_objects/palettes/event_object_palette_04.pal b/graphics/object_events/palettes/event_object_palette_04.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_04.pal rename to graphics/object_events/palettes/event_object_palette_04.pal diff --git a/graphics/event_objects/palettes/event_object_palette_05.pal b/graphics/object_events/palettes/event_object_palette_05.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_05.pal rename to graphics/object_events/palettes/event_object_palette_05.pal diff --git a/graphics/event_objects/palettes/event_object_palette_06.pal b/graphics/object_events/palettes/event_object_palette_06.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_06.pal rename to graphics/object_events/palettes/event_object_palette_06.pal diff --git a/graphics/event_objects/palettes/event_object_palette_07.pal b/graphics/object_events/palettes/event_object_palette_07.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_07.pal rename to graphics/object_events/palettes/event_object_palette_07.pal diff --git a/graphics/event_objects/palettes/event_object_palette_08.pal b/graphics/object_events/palettes/event_object_palette_08.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_08.pal rename to graphics/object_events/palettes/event_object_palette_08.pal diff --git a/graphics/event_objects/palettes/event_object_palette_09.pal b/graphics/object_events/palettes/event_object_palette_09.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_09.pal rename to graphics/object_events/palettes/event_object_palette_09.pal diff --git a/graphics/event_objects/palettes/event_object_palette_10.pal b/graphics/object_events/palettes/event_object_palette_10.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_10.pal rename to graphics/object_events/palettes/event_object_palette_10.pal diff --git a/graphics/event_objects/palettes/event_object_palette_11.pal b/graphics/object_events/palettes/event_object_palette_11.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_11.pal rename to graphics/object_events/palettes/event_object_palette_11.pal diff --git a/graphics/event_objects/palettes/event_object_palette_12.pal b/graphics/object_events/palettes/event_object_palette_12.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_12.pal rename to graphics/object_events/palettes/event_object_palette_12.pal diff --git a/graphics/event_objects/palettes/event_object_palette_13.pal b/graphics/object_events/palettes/event_object_palette_13.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_13.pal rename to graphics/object_events/palettes/event_object_palette_13.pal diff --git a/graphics/event_objects/palettes/event_object_palette_14.pal b/graphics/object_events/palettes/event_object_palette_14.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_14.pal rename to graphics/object_events/palettes/event_object_palette_14.pal diff --git a/graphics/event_objects/palettes/event_object_palette_15.pal b/graphics/object_events/palettes/event_object_palette_15.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_15.pal rename to graphics/object_events/palettes/event_object_palette_15.pal diff --git a/graphics/event_objects/palettes/event_object_palette_16.pal b/graphics/object_events/palettes/event_object_palette_16.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_16.pal rename to graphics/object_events/palettes/event_object_palette_16.pal diff --git a/graphics/event_objects/palettes/event_object_palette_17.pal b/graphics/object_events/palettes/event_object_palette_17.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_17.pal rename to graphics/object_events/palettes/event_object_palette_17.pal diff --git a/graphics/event_objects/palettes/event_object_palette_18.pal b/graphics/object_events/palettes/event_object_palette_18.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_18.pal rename to graphics/object_events/palettes/event_object_palette_18.pal diff --git a/graphics/event_objects/palettes/event_object_palette_19.pal b/graphics/object_events/palettes/event_object_palette_19.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_19.pal rename to graphics/object_events/palettes/event_object_palette_19.pal diff --git a/graphics/event_objects/palettes/event_object_palette_20.pal b/graphics/object_events/palettes/event_object_palette_20.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_20.pal rename to graphics/object_events/palettes/event_object_palette_20.pal diff --git a/graphics/event_objects/palettes/event_object_palette_21.pal b/graphics/object_events/palettes/event_object_palette_21.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_21.pal rename to graphics/object_events/palettes/event_object_palette_21.pal diff --git a/graphics/event_objects/palettes/event_object_palette_22.pal b/graphics/object_events/palettes/event_object_palette_22.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_22.pal rename to graphics/object_events/palettes/event_object_palette_22.pal diff --git a/graphics/event_objects/palettes/event_object_palette_23.pal b/graphics/object_events/palettes/event_object_palette_23.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_23.pal rename to graphics/object_events/palettes/event_object_palette_23.pal diff --git a/graphics/event_objects/palettes/event_object_palette_24.pal b/graphics/object_events/palettes/event_object_palette_24.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_24.pal rename to graphics/object_events/palettes/event_object_palette_24.pal diff --git a/graphics/event_objects/palettes/event_object_palette_25.pal b/graphics/object_events/palettes/event_object_palette_25.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_25.pal rename to graphics/object_events/palettes/event_object_palette_25.pal diff --git a/graphics/event_objects/palettes/event_object_palette_26.pal b/graphics/object_events/palettes/event_object_palette_26.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_26.pal rename to graphics/object_events/palettes/event_object_palette_26.pal diff --git a/graphics/event_objects/palettes/event_object_palette_27.pal b/graphics/object_events/palettes/event_object_palette_27.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_27.pal rename to graphics/object_events/palettes/event_object_palette_27.pal diff --git a/graphics/event_objects/palettes/event_object_palette_28.pal b/graphics/object_events/palettes/event_object_palette_28.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_28.pal rename to graphics/object_events/palettes/event_object_palette_28.pal diff --git a/graphics/event_objects/palettes/event_object_palette_29.pal b/graphics/object_events/palettes/event_object_palette_29.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_29.pal rename to graphics/object_events/palettes/event_object_palette_29.pal diff --git a/graphics/event_objects/palettes/event_object_palette_30.pal b/graphics/object_events/palettes/event_object_palette_30.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_30.pal rename to graphics/object_events/palettes/event_object_palette_30.pal diff --git a/graphics/event_objects/palettes/event_object_palette_31.pal b/graphics/object_events/palettes/event_object_palette_31.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_31.pal rename to graphics/object_events/palettes/event_object_palette_31.pal diff --git a/graphics/event_objects/palettes/event_object_palette_32.pal b/graphics/object_events/palettes/event_object_palette_32.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_32.pal rename to graphics/object_events/palettes/event_object_palette_32.pal diff --git a/graphics/event_objects/palettes/event_object_palette_33.pal b/graphics/object_events/palettes/event_object_palette_33.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_33.pal rename to graphics/object_events/palettes/event_object_palette_33.pal diff --git a/graphics/event_objects/palettes/event_object_palette_34.pal b/graphics/object_events/palettes/event_object_palette_34.pal similarity index 100% rename from graphics/event_objects/palettes/event_object_palette_34.pal rename to graphics/object_events/palettes/event_object_palette_34.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_00.pal b/graphics/object_events/palettes/field_effect_object_palette_00.pal similarity index 100% rename from graphics/event_objects/palettes/field_effect_object_palette_00.pal rename to graphics/object_events/palettes/field_effect_object_palette_00.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_01.pal b/graphics/object_events/palettes/field_effect_object_palette_01.pal similarity index 100% rename from graphics/event_objects/palettes/field_effect_object_palette_01.pal rename to graphics/object_events/palettes/field_effect_object_palette_01.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_02.pal b/graphics/object_events/palettes/field_effect_object_palette_02.pal similarity index 100% rename from graphics/event_objects/palettes/field_effect_object_palette_02.pal rename to graphics/object_events/palettes/field_effect_object_palette_02.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_03.pal b/graphics/object_events/palettes/field_effect_object_palette_03.pal similarity index 100% rename from graphics/event_objects/palettes/field_effect_object_palette_03.pal rename to graphics/object_events/palettes/field_effect_object_palette_03.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_04.pal b/graphics/object_events/palettes/field_effect_object_palette_04.pal similarity index 100% rename from graphics/event_objects/palettes/field_effect_object_palette_04.pal rename to graphics/object_events/palettes/field_effect_object_palette_04.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_05.pal b/graphics/object_events/palettes/field_effect_object_palette_05.pal similarity index 100% rename from graphics/event_objects/palettes/field_effect_object_palette_05.pal rename to graphics/object_events/palettes/field_effect_object_palette_05.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_06.pal b/graphics/object_events/palettes/field_effect_object_palette_06.pal similarity index 100% rename from graphics/event_objects/palettes/field_effect_object_palette_06.pal rename to graphics/object_events/palettes/field_effect_object_palette_06.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_07.pal b/graphics/object_events/palettes/field_effect_object_palette_07.pal similarity index 100% rename from graphics/event_objects/palettes/field_effect_object_palette_07.pal rename to graphics/object_events/palettes/field_effect_object_palette_07.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_08.pal b/graphics/object_events/palettes/field_effect_object_palette_08.pal similarity index 100% rename from graphics/event_objects/palettes/field_effect_object_palette_08.pal rename to graphics/object_events/palettes/field_effect_object_palette_08.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_10.pal b/graphics/object_events/palettes/field_effect_object_palette_10.pal similarity index 100% rename from graphics/event_objects/palettes/field_effect_object_palette_10.pal rename to graphics/object_events/palettes/field_effect_object_palette_10.pal diff --git a/graphics/event_objects/palettes/unused_palette.pal b/graphics/object_events/palettes/unused_palette.pal similarity index 100% rename from graphics/event_objects/palettes/unused_palette.pal rename to graphics/object_events/palettes/unused_palette.pal diff --git a/graphics/event_objects/pics/berry_trees/aguav.png b/graphics/object_events/pics/berry_trees/aguav.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/aguav.png rename to graphics/object_events/pics/berry_trees/aguav.png diff --git a/graphics/event_objects/pics/berry_trees/aspear.png b/graphics/object_events/pics/berry_trees/aspear.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/aspear.png rename to graphics/object_events/pics/berry_trees/aspear.png diff --git a/graphics/event_objects/pics/berry_trees/cheri.png b/graphics/object_events/pics/berry_trees/cheri.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/cheri.png rename to graphics/object_events/pics/berry_trees/cheri.png diff --git a/graphics/event_objects/pics/berry_trees/chesto.png b/graphics/object_events/pics/berry_trees/chesto.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/chesto.png rename to graphics/object_events/pics/berry_trees/chesto.png diff --git a/graphics/event_objects/pics/berry_trees/cornn.png b/graphics/object_events/pics/berry_trees/cornn.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/cornn.png rename to graphics/object_events/pics/berry_trees/cornn.png diff --git a/graphics/event_objects/pics/berry_trees/dirt_pile.png b/graphics/object_events/pics/berry_trees/dirt_pile.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/dirt_pile.png rename to graphics/object_events/pics/berry_trees/dirt_pile.png diff --git a/graphics/event_objects/pics/berry_trees/durin.png b/graphics/object_events/pics/berry_trees/durin.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/durin.png rename to graphics/object_events/pics/berry_trees/durin.png diff --git a/graphics/event_objects/pics/berry_trees/figy.png b/graphics/object_events/pics/berry_trees/figy.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/figy.png rename to graphics/object_events/pics/berry_trees/figy.png diff --git a/graphics/event_objects/pics/berry_trees/grepa.png b/graphics/object_events/pics/berry_trees/grepa.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/grepa.png rename to graphics/object_events/pics/berry_trees/grepa.png diff --git a/graphics/event_objects/pics/berry_trees/hondew.png b/graphics/object_events/pics/berry_trees/hondew.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/hondew.png rename to graphics/object_events/pics/berry_trees/hondew.png diff --git a/graphics/event_objects/pics/berry_trees/iapapa.png b/graphics/object_events/pics/berry_trees/iapapa.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/iapapa.png rename to graphics/object_events/pics/berry_trees/iapapa.png diff --git a/graphics/event_objects/pics/berry_trees/kelpsy.png b/graphics/object_events/pics/berry_trees/kelpsy.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/kelpsy.png rename to graphics/object_events/pics/berry_trees/kelpsy.png diff --git a/graphics/event_objects/pics/berry_trees/lansat.png b/graphics/object_events/pics/berry_trees/lansat.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/lansat.png rename to graphics/object_events/pics/berry_trees/lansat.png diff --git a/graphics/event_objects/pics/berry_trees/leppa.png b/graphics/object_events/pics/berry_trees/leppa.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/leppa.png rename to graphics/object_events/pics/berry_trees/leppa.png diff --git a/graphics/event_objects/pics/berry_trees/liechi.png b/graphics/object_events/pics/berry_trees/liechi.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/liechi.png rename to graphics/object_events/pics/berry_trees/liechi.png diff --git a/graphics/event_objects/pics/berry_trees/lum.png b/graphics/object_events/pics/berry_trees/lum.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/lum.png rename to graphics/object_events/pics/berry_trees/lum.png diff --git a/graphics/event_objects/pics/berry_trees/mago.png b/graphics/object_events/pics/berry_trees/mago.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/mago.png rename to graphics/object_events/pics/berry_trees/mago.png diff --git a/graphics/event_objects/pics/berry_trees/nomel.png b/graphics/object_events/pics/berry_trees/nomel.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/nomel.png rename to graphics/object_events/pics/berry_trees/nomel.png diff --git a/graphics/event_objects/pics/berry_trees/oran.png b/graphics/object_events/pics/berry_trees/oran.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/oran.png rename to graphics/object_events/pics/berry_trees/oran.png diff --git a/graphics/event_objects/pics/berry_trees/pamtre.png b/graphics/object_events/pics/berry_trees/pamtre.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/pamtre.png rename to graphics/object_events/pics/berry_trees/pamtre.png diff --git a/graphics/event_objects/pics/berry_trees/pecha.png b/graphics/object_events/pics/berry_trees/pecha.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/pecha.png rename to graphics/object_events/pics/berry_trees/pecha.png diff --git a/graphics/event_objects/pics/berry_trees/persim.png b/graphics/object_events/pics/berry_trees/persim.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/persim.png rename to graphics/object_events/pics/berry_trees/persim.png diff --git a/graphics/event_objects/pics/berry_trees/pomeg.png b/graphics/object_events/pics/berry_trees/pomeg.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/pomeg.png rename to graphics/object_events/pics/berry_trees/pomeg.png diff --git a/graphics/event_objects/pics/berry_trees/rabuta.png b/graphics/object_events/pics/berry_trees/rabuta.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/rabuta.png rename to graphics/object_events/pics/berry_trees/rabuta.png diff --git a/graphics/event_objects/pics/berry_trees/rawst.png b/graphics/object_events/pics/berry_trees/rawst.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/rawst.png rename to graphics/object_events/pics/berry_trees/rawst.png diff --git a/graphics/event_objects/pics/berry_trees/razz.png b/graphics/object_events/pics/berry_trees/razz.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/razz.png rename to graphics/object_events/pics/berry_trees/razz.png diff --git a/graphics/event_objects/pics/berry_trees/sitrus.png b/graphics/object_events/pics/berry_trees/sitrus.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/sitrus.png rename to graphics/object_events/pics/berry_trees/sitrus.png diff --git a/graphics/event_objects/pics/berry_trees/spelon.png b/graphics/object_events/pics/berry_trees/spelon.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/spelon.png rename to graphics/object_events/pics/berry_trees/spelon.png diff --git a/graphics/event_objects/pics/berry_trees/sprout.png b/graphics/object_events/pics/berry_trees/sprout.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/sprout.png rename to graphics/object_events/pics/berry_trees/sprout.png diff --git a/graphics/event_objects/pics/berry_trees/tamato.png b/graphics/object_events/pics/berry_trees/tamato.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/tamato.png rename to graphics/object_events/pics/berry_trees/tamato.png diff --git a/graphics/event_objects/pics/berry_trees/wepear.png b/graphics/object_events/pics/berry_trees/wepear.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/wepear.png rename to graphics/object_events/pics/berry_trees/wepear.png diff --git a/graphics/event_objects/pics/berry_trees/wiki.png b/graphics/object_events/pics/berry_trees/wiki.png similarity index 100% rename from graphics/event_objects/pics/berry_trees/wiki.png rename to graphics/object_events/pics/berry_trees/wiki.png diff --git a/graphics/event_objects/pics/cushions/ball_cushion.png b/graphics/object_events/pics/cushions/ball_cushion.png similarity index 100% rename from graphics/event_objects/pics/cushions/ball_cushion.png rename to graphics/object_events/pics/cushions/ball_cushion.png diff --git a/graphics/event_objects/pics/cushions/diamond_cushion.png b/graphics/object_events/pics/cushions/diamond_cushion.png similarity index 100% rename from graphics/event_objects/pics/cushions/diamond_cushion.png rename to graphics/object_events/pics/cushions/diamond_cushion.png diff --git a/graphics/event_objects/pics/cushions/fire_cushion.png b/graphics/object_events/pics/cushions/fire_cushion.png similarity index 100% rename from graphics/event_objects/pics/cushions/fire_cushion.png rename to graphics/object_events/pics/cushions/fire_cushion.png diff --git a/graphics/event_objects/pics/cushions/grass_cushion.png b/graphics/object_events/pics/cushions/grass_cushion.png similarity index 100% rename from graphics/event_objects/pics/cushions/grass_cushion.png rename to graphics/object_events/pics/cushions/grass_cushion.png diff --git a/graphics/event_objects/pics/cushions/kiss_cushion.png b/graphics/object_events/pics/cushions/kiss_cushion.png similarity index 100% rename from graphics/event_objects/pics/cushions/kiss_cushion.png rename to graphics/object_events/pics/cushions/kiss_cushion.png diff --git a/graphics/event_objects/pics/cushions/pika_cushion.png b/graphics/object_events/pics/cushions/pika_cushion.png similarity index 100% rename from graphics/event_objects/pics/cushions/pika_cushion.png rename to graphics/object_events/pics/cushions/pika_cushion.png diff --git a/graphics/event_objects/pics/cushions/round_cushion.png b/graphics/object_events/pics/cushions/round_cushion.png similarity index 100% rename from graphics/event_objects/pics/cushions/round_cushion.png rename to graphics/object_events/pics/cushions/round_cushion.png diff --git a/graphics/event_objects/pics/cushions/spin_cushion.png b/graphics/object_events/pics/cushions/spin_cushion.png similarity index 100% rename from graphics/event_objects/pics/cushions/spin_cushion.png rename to graphics/object_events/pics/cushions/spin_cushion.png diff --git a/graphics/event_objects/pics/cushions/water_cushion.png b/graphics/object_events/pics/cushions/water_cushion.png similarity index 100% rename from graphics/event_objects/pics/cushions/water_cushion.png rename to graphics/object_events/pics/cushions/water_cushion.png diff --git a/graphics/event_objects/pics/cushions/zigzag_cushion.png b/graphics/object_events/pics/cushions/zigzag_cushion.png similarity index 100% rename from graphics/event_objects/pics/cushions/zigzag_cushion.png rename to graphics/object_events/pics/cushions/zigzag_cushion.png diff --git a/graphics/event_objects/pics/dolls/azurill_doll.png b/graphics/object_events/pics/dolls/azurill_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/azurill_doll.png rename to graphics/object_events/pics/dolls/azurill_doll.png diff --git a/graphics/event_objects/pics/dolls/baltoy_doll.png b/graphics/object_events/pics/dolls/baltoy_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/baltoy_doll.png rename to graphics/object_events/pics/dolls/baltoy_doll.png diff --git a/graphics/event_objects/pics/dolls/big_blastoise_doll.png b/graphics/object_events/pics/dolls/big_blastoise_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/big_blastoise_doll.png rename to graphics/object_events/pics/dolls/big_blastoise_doll.png diff --git a/graphics/event_objects/pics/dolls/big_charizard_doll.png b/graphics/object_events/pics/dolls/big_charizard_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/big_charizard_doll.png rename to graphics/object_events/pics/dolls/big_charizard_doll.png diff --git a/graphics/event_objects/pics/dolls/big_lapras_doll.png b/graphics/object_events/pics/dolls/big_lapras_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/big_lapras_doll.png rename to graphics/object_events/pics/dolls/big_lapras_doll.png diff --git a/graphics/event_objects/pics/dolls/big_regice_doll.png b/graphics/object_events/pics/dolls/big_regice_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/big_regice_doll.png rename to graphics/object_events/pics/dolls/big_regice_doll.png diff --git a/graphics/event_objects/pics/dolls/big_regirock_doll.png b/graphics/object_events/pics/dolls/big_regirock_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/big_regirock_doll.png rename to graphics/object_events/pics/dolls/big_regirock_doll.png diff --git a/graphics/event_objects/pics/dolls/big_registeel_doll.png b/graphics/object_events/pics/dolls/big_registeel_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/big_registeel_doll.png rename to graphics/object_events/pics/dolls/big_registeel_doll.png diff --git a/graphics/event_objects/pics/dolls/big_rhydon_doll.png b/graphics/object_events/pics/dolls/big_rhydon_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/big_rhydon_doll.png rename to graphics/object_events/pics/dolls/big_rhydon_doll.png diff --git a/graphics/event_objects/pics/dolls/big_snorlax_doll.png b/graphics/object_events/pics/dolls/big_snorlax_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/big_snorlax_doll.png rename to graphics/object_events/pics/dolls/big_snorlax_doll.png diff --git a/graphics/event_objects/pics/dolls/big_venusaur_doll.png b/graphics/object_events/pics/dolls/big_venusaur_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/big_venusaur_doll.png rename to graphics/object_events/pics/dolls/big_venusaur_doll.png diff --git a/graphics/event_objects/pics/dolls/big_wailmer_doll.png b/graphics/object_events/pics/dolls/big_wailmer_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/big_wailmer_doll.png rename to graphics/object_events/pics/dolls/big_wailmer_doll.png diff --git a/graphics/event_objects/pics/dolls/chikorita_doll.png b/graphics/object_events/pics/dolls/chikorita_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/chikorita_doll.png rename to graphics/object_events/pics/dolls/chikorita_doll.png diff --git a/graphics/event_objects/pics/dolls/clefairy_doll.png b/graphics/object_events/pics/dolls/clefairy_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/clefairy_doll.png rename to graphics/object_events/pics/dolls/clefairy_doll.png diff --git a/graphics/event_objects/pics/dolls/cyndaquil_doll.png b/graphics/object_events/pics/dolls/cyndaquil_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/cyndaquil_doll.png rename to graphics/object_events/pics/dolls/cyndaquil_doll.png diff --git a/graphics/event_objects/pics/dolls/ditto_doll.png b/graphics/object_events/pics/dolls/ditto_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/ditto_doll.png rename to graphics/object_events/pics/dolls/ditto_doll.png diff --git a/graphics/event_objects/pics/dolls/duskull_doll.png b/graphics/object_events/pics/dolls/duskull_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/duskull_doll.png rename to graphics/object_events/pics/dolls/duskull_doll.png diff --git a/graphics/event_objects/pics/dolls/gulpin_doll.png b/graphics/object_events/pics/dolls/gulpin_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/gulpin_doll.png rename to graphics/object_events/pics/dolls/gulpin_doll.png diff --git a/graphics/event_objects/pics/dolls/jigglypuff_doll.png b/graphics/object_events/pics/dolls/jigglypuff_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/jigglypuff_doll.png rename to graphics/object_events/pics/dolls/jigglypuff_doll.png diff --git a/graphics/event_objects/pics/dolls/kecleon_doll.png b/graphics/object_events/pics/dolls/kecleon_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/kecleon_doll.png rename to graphics/object_events/pics/dolls/kecleon_doll.png diff --git a/graphics/event_objects/pics/dolls/lotad_doll.png b/graphics/object_events/pics/dolls/lotad_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/lotad_doll.png rename to graphics/object_events/pics/dolls/lotad_doll.png diff --git a/graphics/event_objects/pics/dolls/marill_doll.png b/graphics/object_events/pics/dolls/marill_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/marill_doll.png rename to graphics/object_events/pics/dolls/marill_doll.png diff --git a/graphics/event_objects/pics/dolls/meowth_doll.png b/graphics/object_events/pics/dolls/meowth_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/meowth_doll.png rename to graphics/object_events/pics/dolls/meowth_doll.png diff --git a/graphics/event_objects/pics/dolls/mudkip_doll.png b/graphics/object_events/pics/dolls/mudkip_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/mudkip_doll.png rename to graphics/object_events/pics/dolls/mudkip_doll.png diff --git a/graphics/event_objects/pics/dolls/pichu_doll.png b/graphics/object_events/pics/dolls/pichu_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/pichu_doll.png rename to graphics/object_events/pics/dolls/pichu_doll.png diff --git a/graphics/event_objects/pics/dolls/pikachu_doll.png b/graphics/object_events/pics/dolls/pikachu_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/pikachu_doll.png rename to graphics/object_events/pics/dolls/pikachu_doll.png diff --git a/graphics/event_objects/pics/dolls/seedot_doll.png b/graphics/object_events/pics/dolls/seedot_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/seedot_doll.png rename to graphics/object_events/pics/dolls/seedot_doll.png diff --git a/graphics/event_objects/pics/dolls/skitty_doll.png b/graphics/object_events/pics/dolls/skitty_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/skitty_doll.png rename to graphics/object_events/pics/dolls/skitty_doll.png diff --git a/graphics/event_objects/pics/dolls/smoochum_doll.png b/graphics/object_events/pics/dolls/smoochum_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/smoochum_doll.png rename to graphics/object_events/pics/dolls/smoochum_doll.png diff --git a/graphics/event_objects/pics/dolls/swablu_doll.png b/graphics/object_events/pics/dolls/swablu_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/swablu_doll.png rename to graphics/object_events/pics/dolls/swablu_doll.png diff --git a/graphics/event_objects/pics/dolls/togepi_doll.png b/graphics/object_events/pics/dolls/togepi_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/togepi_doll.png rename to graphics/object_events/pics/dolls/togepi_doll.png diff --git a/graphics/event_objects/pics/dolls/torchic_doll.png b/graphics/object_events/pics/dolls/torchic_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/torchic_doll.png rename to graphics/object_events/pics/dolls/torchic_doll.png diff --git a/graphics/event_objects/pics/dolls/totodile_doll.png b/graphics/object_events/pics/dolls/totodile_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/totodile_doll.png rename to graphics/object_events/pics/dolls/totodile_doll.png diff --git a/graphics/event_objects/pics/dolls/treecko_doll.png b/graphics/object_events/pics/dolls/treecko_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/treecko_doll.png rename to graphics/object_events/pics/dolls/treecko_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_magnemite_doll.png b/graphics/object_events/pics/dolls/unused_magnemite_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/unused_magnemite_doll.png rename to graphics/object_events/pics/dolls/unused_magnemite_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_natu_doll.png b/graphics/object_events/pics/dolls/unused_natu_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/unused_natu_doll.png rename to graphics/object_events/pics/dolls/unused_natu_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_pikachu_doll.png b/graphics/object_events/pics/dolls/unused_pikachu_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/unused_pikachu_doll.png rename to graphics/object_events/pics/dolls/unused_pikachu_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_porygon2_doll.png b/graphics/object_events/pics/dolls/unused_porygon2_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/unused_porygon2_doll.png rename to graphics/object_events/pics/dolls/unused_porygon2_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_squirtle_doll.png b/graphics/object_events/pics/dolls/unused_squirtle_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/unused_squirtle_doll.png rename to graphics/object_events/pics/dolls/unused_squirtle_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_wooper_doll.png b/graphics/object_events/pics/dolls/unused_wooper_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/unused_wooper_doll.png rename to graphics/object_events/pics/dolls/unused_wooper_doll.png diff --git a/graphics/event_objects/pics/dolls/wynaut_doll.png b/graphics/object_events/pics/dolls/wynaut_doll.png similarity index 100% rename from graphics/event_objects/pics/dolls/wynaut_doll.png rename to graphics/object_events/pics/dolls/wynaut_doll.png diff --git a/graphics/event_objects/pics/effects/arrow.png b/graphics/object_events/pics/effects/arrow.png similarity index 100% rename from graphics/event_objects/pics/effects/arrow.png rename to graphics/object_events/pics/effects/arrow.png diff --git a/graphics/event_objects/pics/effects/ash.png b/graphics/object_events/pics/effects/ash.png similarity index 100% rename from graphics/event_objects/pics/effects/ash.png rename to graphics/object_events/pics/effects/ash.png diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle.png b/graphics/object_events/pics/effects/berry_tree_growth_sparkle.png similarity index 100% rename from graphics/event_objects/pics/effects/berry_tree_growth_sparkle.png rename to graphics/object_events/pics/effects/berry_tree_growth_sparkle.png diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash.png b/graphics/object_events/pics/effects/bike_hop_big_splash.png similarity index 100% rename from graphics/event_objects/pics/effects/bike_hop_big_splash.png rename to graphics/object_events/pics/effects/bike_hop_big_splash.png diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash.png b/graphics/object_events/pics/effects/bike_hop_small_splash.png similarity index 100% rename from graphics/event_objects/pics/effects/bike_hop_small_splash.png rename to graphics/object_events/pics/effects/bike_hop_small_splash.png diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass.png b/graphics/object_events/pics/effects/bike_hop_tall_grass.png similarity index 100% rename from graphics/event_objects/pics/effects/bike_hop_tall_grass.png rename to graphics/object_events/pics/effects/bike_hop_tall_grass.png diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks.png b/graphics/object_events/pics/effects/bike_tire_tracks.png similarity index 100% rename from graphics/event_objects/pics/effects/bike_tire_tracks.png rename to graphics/object_events/pics/effects/bike_tire_tracks.png diff --git a/graphics/event_objects/pics/effects/bird.png b/graphics/object_events/pics/effects/bird.png similarity index 100% rename from graphics/event_objects/pics/effects/bird.png rename to graphics/object_events/pics/effects/bird.png diff --git a/graphics/event_objects/pics/effects/bubbles.png b/graphics/object_events/pics/effects/bubbles.png similarity index 100% rename from graphics/event_objects/pics/effects/bubbles.png rename to graphics/object_events/pics/effects/bubbles.png diff --git a/graphics/event_objects/pics/effects/cut_grass.png b/graphics/object_events/pics/effects/cut_grass.png similarity index 100% rename from graphics/event_objects/pics/effects/cut_grass.png rename to graphics/object_events/pics/effects/cut_grass.png diff --git a/graphics/event_objects/pics/effects/deep_sand_footprints.png b/graphics/object_events/pics/effects/deep_sand_footprints.png similarity index 100% rename from graphics/event_objects/pics/effects/deep_sand_footprints.png rename to graphics/object_events/pics/effects/deep_sand_footprints.png diff --git a/graphics/event_objects/pics/effects/ground_impact_dust.png b/graphics/object_events/pics/effects/ground_impact_dust.png similarity index 100% rename from graphics/event_objects/pics/effects/ground_impact_dust.png rename to graphics/object_events/pics/effects/ground_impact_dust.png diff --git a/graphics/event_objects/pics/effects/hot_springs_water.png b/graphics/object_events/pics/effects/hot_springs_water.png similarity index 100% rename from graphics/event_objects/pics/effects/hot_springs_water.png rename to graphics/object_events/pics/effects/hot_springs_water.png diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash.png b/graphics/object_events/pics/effects/jump_out_of_ash.png similarity index 100% rename from graphics/event_objects/pics/effects/jump_out_of_ash.png rename to graphics/object_events/pics/effects/jump_out_of_ash.png diff --git a/graphics/event_objects/pics/effects/long_grass.png b/graphics/object_events/pics/effects/long_grass.png similarity index 100% rename from graphics/event_objects/pics/effects/long_grass.png rename to graphics/object_events/pics/effects/long_grass.png diff --git a/graphics/event_objects/pics/effects/mountain_disguise.png b/graphics/object_events/pics/effects/mountain_disguise.png similarity index 100% rename from graphics/event_objects/pics/effects/mountain_disguise.png rename to graphics/object_events/pics/effects/mountain_disguise.png diff --git a/graphics/event_objects/pics/effects/ripple.png b/graphics/object_events/pics/effects/ripple.png similarity index 100% rename from graphics/event_objects/pics/effects/ripple.png rename to graphics/object_events/pics/effects/ripple.png diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder.png b/graphics/object_events/pics/effects/sand_disguise_placeholder.png similarity index 100% rename from graphics/event_objects/pics/effects/sand_disguise_placeholder.png rename to graphics/object_events/pics/effects/sand_disguise_placeholder.png diff --git a/graphics/event_objects/pics/effects/sand_footprints.png b/graphics/object_events/pics/effects/sand_footprints.png similarity index 100% rename from graphics/event_objects/pics/effects/sand_footprints.png rename to graphics/object_events/pics/effects/sand_footprints.png diff --git a/graphics/event_objects/pics/effects/shadow_extra_large.png b/graphics/object_events/pics/effects/shadow_extra_large.png similarity index 100% rename from graphics/event_objects/pics/effects/shadow_extra_large.png rename to graphics/object_events/pics/effects/shadow_extra_large.png diff --git a/graphics/event_objects/pics/effects/shadow_large.png b/graphics/object_events/pics/effects/shadow_large.png similarity index 100% rename from graphics/event_objects/pics/effects/shadow_large.png rename to graphics/object_events/pics/effects/shadow_large.png diff --git a/graphics/event_objects/pics/effects/shadow_medium.png b/graphics/object_events/pics/effects/shadow_medium.png similarity index 100% rename from graphics/event_objects/pics/effects/shadow_medium.png rename to graphics/object_events/pics/effects/shadow_medium.png diff --git a/graphics/event_objects/pics/effects/shadow_small.png b/graphics/object_events/pics/effects/shadow_small.png similarity index 100% rename from graphics/event_objects/pics/effects/shadow_small.png rename to graphics/object_events/pics/effects/shadow_small.png diff --git a/graphics/event_objects/pics/effects/short_grass.png b/graphics/object_events/pics/effects/short_grass.png similarity index 100% rename from graphics/event_objects/pics/effects/short_grass.png rename to graphics/object_events/pics/effects/short_grass.png diff --git a/graphics/event_objects/pics/effects/splash.png b/graphics/object_events/pics/effects/splash.png similarity index 100% rename from graphics/event_objects/pics/effects/splash.png rename to graphics/object_events/pics/effects/splash.png diff --git a/graphics/event_objects/pics/effects/surf_blob.png b/graphics/object_events/pics/effects/surf_blob.png similarity index 100% rename from graphics/event_objects/pics/effects/surf_blob.png rename to graphics/object_events/pics/effects/surf_blob.png diff --git a/graphics/event_objects/pics/effects/tall_grass.png b/graphics/object_events/pics/effects/tall_grass.png similarity index 100% rename from graphics/event_objects/pics/effects/tall_grass.png rename to graphics/object_events/pics/effects/tall_grass.png diff --git a/graphics/event_objects/pics/effects/tree_disguise.png b/graphics/object_events/pics/effects/tree_disguise.png similarity index 100% rename from graphics/event_objects/pics/effects/tree_disguise.png rename to graphics/object_events/pics/effects/tree_disguise.png diff --git a/graphics/event_objects/pics/effects/unknown_16.png b/graphics/object_events/pics/effects/unknown_16.png similarity index 100% rename from graphics/event_objects/pics/effects/unknown_16.png rename to graphics/object_events/pics/effects/unknown_16.png diff --git a/graphics/event_objects/pics/effects/unknown_17.png b/graphics/object_events/pics/effects/unknown_17.png similarity index 100% rename from graphics/event_objects/pics/effects/unknown_17.png rename to graphics/object_events/pics/effects/unknown_17.png diff --git a/graphics/event_objects/pics/effects/unknown_18.png b/graphics/object_events/pics/effects/unknown_18.png similarity index 100% rename from graphics/event_objects/pics/effects/unknown_18.png rename to graphics/object_events/pics/effects/unknown_18.png diff --git a/graphics/event_objects/pics/effects/unknown_19.png b/graphics/object_events/pics/effects/unknown_19.png similarity index 100% rename from graphics/event_objects/pics/effects/unknown_19.png rename to graphics/object_events/pics/effects/unknown_19.png diff --git a/graphics/event_objects/pics/effects/unknown_20.png b/graphics/object_events/pics/effects/unknown_20.png similarity index 100% rename from graphics/event_objects/pics/effects/unknown_20.png rename to graphics/object_events/pics/effects/unknown_20.png diff --git a/graphics/event_objects/pics/effects/unknown_29.png b/graphics/object_events/pics/effects/unknown_29.png similarity index 100% rename from graphics/event_objects/pics/effects/unknown_29.png rename to graphics/object_events/pics/effects/unknown_29.png diff --git a/graphics/event_objects/pics/effects/unknown_33.png b/graphics/object_events/pics/effects/unknown_33.png similarity index 100% rename from graphics/event_objects/pics/effects/unknown_33.png rename to graphics/object_events/pics/effects/unknown_33.png diff --git a/graphics/event_objects/pics/effects/unknown_35.png b/graphics/object_events/pics/effects/unknown_35.png similarity index 100% rename from graphics/event_objects/pics/effects/unknown_35.png rename to graphics/object_events/pics/effects/unknown_35.png diff --git a/graphics/event_objects/pics/effects/unused_grass.png b/graphics/object_events/pics/effects/unused_grass.png similarity index 100% rename from graphics/event_objects/pics/effects/unused_grass.png rename to graphics/object_events/pics/effects/unused_grass.png diff --git a/graphics/event_objects/pics/misc/birchs_bag.png b/graphics/object_events/pics/misc/birchs_bag.png similarity index 100% rename from graphics/event_objects/pics/misc/birchs_bag.png rename to graphics/object_events/pics/misc/birchs_bag.png diff --git a/graphics/event_objects/pics/misc/birth_island_stone.png b/graphics/object_events/pics/misc/birth_island_stone.png similarity index 100% rename from graphics/event_objects/pics/misc/birth_island_stone.png rename to graphics/object_events/pics/misc/birth_island_stone.png diff --git a/graphics/event_objects/pics/misc/breakable_rock.png b/graphics/object_events/pics/misc/breakable_rock.png similarity index 100% rename from graphics/event_objects/pics/misc/breakable_rock.png rename to graphics/object_events/pics/misc/breakable_rock.png diff --git a/graphics/event_objects/pics/misc/cable_car.png b/graphics/object_events/pics/misc/cable_car.png similarity index 100% rename from graphics/event_objects/pics/misc/cable_car.png rename to graphics/object_events/pics/misc/cable_car.png diff --git a/graphics/event_objects/pics/misc/cuttable_tree.png b/graphics/object_events/pics/misc/cuttable_tree.png similarity index 100% rename from graphics/event_objects/pics/misc/cuttable_tree.png rename to graphics/object_events/pics/misc/cuttable_tree.png diff --git a/graphics/event_objects/pics/misc/fossil.png b/graphics/object_events/pics/misc/fossil.png similarity index 100% rename from graphics/event_objects/pics/misc/fossil.png rename to graphics/object_events/pics/misc/fossil.png diff --git a/graphics/event_objects/pics/misc/item_ball.png b/graphics/object_events/pics/misc/item_ball.png similarity index 100% rename from graphics/event_objects/pics/misc/item_ball.png rename to graphics/object_events/pics/misc/item_ball.png diff --git a/graphics/event_objects/pics/misc/moving_box.png b/graphics/object_events/pics/misc/moving_box.png similarity index 100% rename from graphics/event_objects/pics/misc/moving_box.png rename to graphics/object_events/pics/misc/moving_box.png diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat.png b/graphics/object_events/pics/misc/mr_brineys_boat.png similarity index 100% rename from graphics/event_objects/pics/misc/mr_brineys_boat.png rename to graphics/object_events/pics/misc/mr_brineys_boat.png diff --git a/graphics/event_objects/pics/misc/pushable_boulder.png b/graphics/object_events/pics/misc/pushable_boulder.png similarity index 100% rename from graphics/event_objects/pics/misc/pushable_boulder.png rename to graphics/object_events/pics/misc/pushable_boulder.png diff --git a/graphics/event_objects/pics/misc/ss_tidal.png b/graphics/object_events/pics/misc/ss_tidal.png similarity index 100% rename from graphics/event_objects/pics/misc/ss_tidal.png rename to graphics/object_events/pics/misc/ss_tidal.png diff --git a/graphics/event_objects/pics/misc/statue.png b/graphics/object_events/pics/misc/statue.png similarity index 100% rename from graphics/event_objects/pics/misc/statue.png rename to graphics/object_events/pics/misc/statue.png diff --git a/graphics/event_objects/pics/misc/submarine_shadow.png b/graphics/object_events/pics/misc/submarine_shadow.png similarity index 100% rename from graphics/event_objects/pics/misc/submarine_shadow.png rename to graphics/object_events/pics/misc/submarine_shadow.png diff --git a/graphics/event_objects/pics/misc/truck.png b/graphics/object_events/pics/misc/truck.png similarity index 100% rename from graphics/event_objects/pics/misc/truck.png rename to graphics/object_events/pics/misc/truck.png diff --git a/graphics/event_objects/pics/people/artist.png b/graphics/object_events/pics/people/artist.png similarity index 100% rename from graphics/event_objects/pics/people/artist.png rename to graphics/object_events/pics/people/artist.png diff --git a/graphics/event_objects/pics/people/beauty.png b/graphics/object_events/pics/people/beauty.png similarity index 100% rename from graphics/event_objects/pics/people/beauty.png rename to graphics/object_events/pics/people/beauty.png diff --git a/graphics/event_objects/pics/people/black_belt.png b/graphics/object_events/pics/people/black_belt.png similarity index 100% rename from graphics/event_objects/pics/people/black_belt.png rename to graphics/object_events/pics/people/black_belt.png diff --git a/graphics/event_objects/pics/people/boy_1.png b/graphics/object_events/pics/people/boy_1.png similarity index 100% rename from graphics/event_objects/pics/people/boy_1.png rename to graphics/object_events/pics/people/boy_1.png diff --git a/graphics/event_objects/pics/people/boy_2.png b/graphics/object_events/pics/people/boy_2.png similarity index 100% rename from graphics/event_objects/pics/people/boy_2.png rename to graphics/object_events/pics/people/boy_2.png diff --git a/graphics/event_objects/pics/people/boy_3.png b/graphics/object_events/pics/people/boy_3.png similarity index 100% rename from graphics/event_objects/pics/people/boy_3.png rename to graphics/object_events/pics/people/boy_3.png diff --git a/graphics/event_objects/pics/people/brendan/acro_bike.png b/graphics/object_events/pics/people/brendan/acro_bike.png similarity index 100% rename from graphics/event_objects/pics/people/brendan/acro_bike.png rename to graphics/object_events/pics/people/brendan/acro_bike.png diff --git a/graphics/event_objects/pics/people/brendan/decorating.png b/graphics/object_events/pics/people/brendan/decorating.png similarity index 100% rename from graphics/event_objects/pics/people/brendan/decorating.png rename to graphics/object_events/pics/people/brendan/decorating.png diff --git a/graphics/event_objects/pics/people/brendan/field_move.png b/graphics/object_events/pics/people/brendan/field_move.png similarity index 100% rename from graphics/event_objects/pics/people/brendan/field_move.png rename to graphics/object_events/pics/people/brendan/field_move.png diff --git a/graphics/event_objects/pics/people/brendan/fishing.png b/graphics/object_events/pics/people/brendan/fishing.png similarity index 100% rename from graphics/event_objects/pics/people/brendan/fishing.png rename to graphics/object_events/pics/people/brendan/fishing.png diff --git a/graphics/event_objects/pics/people/brendan/mach_bike.png b/graphics/object_events/pics/people/brendan/mach_bike.png similarity index 100% rename from graphics/event_objects/pics/people/brendan/mach_bike.png rename to graphics/object_events/pics/people/brendan/mach_bike.png diff --git a/graphics/event_objects/pics/people/brendan/running.png b/graphics/object_events/pics/people/brendan/running.png similarity index 100% rename from graphics/event_objects/pics/people/brendan/running.png rename to graphics/object_events/pics/people/brendan/running.png diff --git a/graphics/event_objects/pics/people/brendan/surfing.png b/graphics/object_events/pics/people/brendan/surfing.png similarity index 100% rename from graphics/event_objects/pics/people/brendan/surfing.png rename to graphics/object_events/pics/people/brendan/surfing.png diff --git a/graphics/event_objects/pics/people/brendan/underwater.png b/graphics/object_events/pics/people/brendan/underwater.png similarity index 100% rename from graphics/event_objects/pics/people/brendan/underwater.png rename to graphics/object_events/pics/people/brendan/underwater.png diff --git a/graphics/event_objects/pics/people/brendan/walking.png b/graphics/object_events/pics/people/brendan/walking.png similarity index 100% rename from graphics/event_objects/pics/people/brendan/walking.png rename to graphics/object_events/pics/people/brendan/walking.png diff --git a/graphics/event_objects/pics/people/brendan/watering.png b/graphics/object_events/pics/people/brendan/watering.png similarity index 100% rename from graphics/event_objects/pics/people/brendan/watering.png rename to graphics/object_events/pics/people/brendan/watering.png diff --git a/graphics/event_objects/pics/people/bug_catcher.png b/graphics/object_events/pics/people/bug_catcher.png similarity index 100% rename from graphics/event_objects/pics/people/bug_catcher.png rename to graphics/object_events/pics/people/bug_catcher.png diff --git a/graphics/event_objects/pics/people/cameraman.png b/graphics/object_events/pics/people/cameraman.png similarity index 100% rename from graphics/event_objects/pics/people/cameraman.png rename to graphics/object_events/pics/people/cameraman.png diff --git a/graphics/event_objects/pics/people/camper.png b/graphics/object_events/pics/people/camper.png similarity index 100% rename from graphics/event_objects/pics/people/camper.png rename to graphics/object_events/pics/people/camper.png diff --git a/graphics/event_objects/pics/people/contest_judge.png b/graphics/object_events/pics/people/contest_judge.png similarity index 100% rename from graphics/event_objects/pics/people/contest_judge.png rename to graphics/object_events/pics/people/contest_judge.png diff --git a/graphics/event_objects/pics/people/cook.png b/graphics/object_events/pics/people/cook.png similarity index 100% rename from graphics/event_objects/pics/people/cook.png rename to graphics/object_events/pics/people/cook.png diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f.png b/graphics/object_events/pics/people/cycling_triathlete_f.png similarity index 100% rename from graphics/event_objects/pics/people/cycling_triathlete_f.png rename to graphics/object_events/pics/people/cycling_triathlete_f.png diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m.png b/graphics/object_events/pics/people/cycling_triathlete_m.png similarity index 100% rename from graphics/event_objects/pics/people/cycling_triathlete_m.png rename to graphics/object_events/pics/people/cycling_triathlete_m.png diff --git a/graphics/event_objects/pics/people/devon_employee.png b/graphics/object_events/pics/people/devon_employee.png similarity index 100% rename from graphics/event_objects/pics/people/devon_employee.png rename to graphics/object_events/pics/people/devon_employee.png diff --git a/graphics/event_objects/pics/people/elite_four/drake.png b/graphics/object_events/pics/people/elite_four/drake.png similarity index 100% rename from graphics/event_objects/pics/people/elite_four/drake.png rename to graphics/object_events/pics/people/elite_four/drake.png diff --git a/graphics/event_objects/pics/people/elite_four/glacia.png b/graphics/object_events/pics/people/elite_four/glacia.png similarity index 100% rename from graphics/event_objects/pics/people/elite_four/glacia.png rename to graphics/object_events/pics/people/elite_four/glacia.png diff --git a/graphics/event_objects/pics/people/elite_four/phoebe.png b/graphics/object_events/pics/people/elite_four/phoebe.png similarity index 100% rename from graphics/event_objects/pics/people/elite_four/phoebe.png rename to graphics/object_events/pics/people/elite_four/phoebe.png diff --git a/graphics/event_objects/pics/people/elite_four/sidney.png b/graphics/object_events/pics/people/elite_four/sidney.png similarity index 100% rename from graphics/event_objects/pics/people/elite_four/sidney.png rename to graphics/object_events/pics/people/elite_four/sidney.png diff --git a/graphics/event_objects/pics/people/expert_f.png b/graphics/object_events/pics/people/expert_f.png similarity index 100% rename from graphics/event_objects/pics/people/expert_f.png rename to graphics/object_events/pics/people/expert_f.png diff --git a/graphics/event_objects/pics/people/expert_m.png b/graphics/object_events/pics/people/expert_m.png similarity index 100% rename from graphics/event_objects/pics/people/expert_m.png rename to graphics/object_events/pics/people/expert_m.png diff --git a/graphics/event_objects/pics/people/fat_man.png b/graphics/object_events/pics/people/fat_man.png similarity index 100% rename from graphics/event_objects/pics/people/fat_man.png rename to graphics/object_events/pics/people/fat_man.png diff --git a/graphics/event_objects/pics/people/fisherman.png b/graphics/object_events/pics/people/fisherman.png similarity index 100% rename from graphics/event_objects/pics/people/fisherman.png rename to graphics/object_events/pics/people/fisherman.png diff --git a/graphics/event_objects/pics/people/frontier_brains/anabel.png b/graphics/object_events/pics/people/frontier_brains/anabel.png similarity index 100% rename from graphics/event_objects/pics/people/frontier_brains/anabel.png rename to graphics/object_events/pics/people/frontier_brains/anabel.png diff --git a/graphics/event_objects/pics/people/frontier_brains/brandon.png b/graphics/object_events/pics/people/frontier_brains/brandon.png similarity index 100% rename from graphics/event_objects/pics/people/frontier_brains/brandon.png rename to graphics/object_events/pics/people/frontier_brains/brandon.png diff --git a/graphics/event_objects/pics/people/frontier_brains/greta.png b/graphics/object_events/pics/people/frontier_brains/greta.png similarity index 100% rename from graphics/event_objects/pics/people/frontier_brains/greta.png rename to graphics/object_events/pics/people/frontier_brains/greta.png diff --git a/graphics/event_objects/pics/people/frontier_brains/lucy.png b/graphics/object_events/pics/people/frontier_brains/lucy.png similarity index 100% rename from graphics/event_objects/pics/people/frontier_brains/lucy.png rename to graphics/object_events/pics/people/frontier_brains/lucy.png diff --git a/graphics/event_objects/pics/people/frontier_brains/noland.png b/graphics/object_events/pics/people/frontier_brains/noland.png similarity index 100% rename from graphics/event_objects/pics/people/frontier_brains/noland.png rename to graphics/object_events/pics/people/frontier_brains/noland.png diff --git a/graphics/event_objects/pics/people/frontier_brains/spenser.png b/graphics/object_events/pics/people/frontier_brains/spenser.png similarity index 100% rename from graphics/event_objects/pics/people/frontier_brains/spenser.png rename to graphics/object_events/pics/people/frontier_brains/spenser.png diff --git a/graphics/event_objects/pics/people/frontier_brains/tucker.png b/graphics/object_events/pics/people/frontier_brains/tucker.png similarity index 100% rename from graphics/event_objects/pics/people/frontier_brains/tucker.png rename to graphics/object_events/pics/people/frontier_brains/tucker.png diff --git a/graphics/event_objects/pics/people/gameboy_kid.png b/graphics/object_events/pics/people/gameboy_kid.png similarity index 100% rename from graphics/event_objects/pics/people/gameboy_kid.png rename to graphics/object_events/pics/people/gameboy_kid.png diff --git a/graphics/event_objects/pics/people/gentleman.png b/graphics/object_events/pics/people/gentleman.png similarity index 100% rename from graphics/event_objects/pics/people/gentleman.png rename to graphics/object_events/pics/people/gentleman.png diff --git a/graphics/event_objects/pics/people/girl_1.png b/graphics/object_events/pics/people/girl_1.png similarity index 100% rename from graphics/event_objects/pics/people/girl_1.png rename to graphics/object_events/pics/people/girl_1.png diff --git a/graphics/event_objects/pics/people/girl_2.png b/graphics/object_events/pics/people/girl_2.png similarity index 100% rename from graphics/event_objects/pics/people/girl_2.png rename to graphics/object_events/pics/people/girl_2.png diff --git a/graphics/event_objects/pics/people/girl_3.png b/graphics/object_events/pics/people/girl_3.png similarity index 100% rename from graphics/event_objects/pics/people/girl_3.png rename to graphics/object_events/pics/people/girl_3.png diff --git a/graphics/event_objects/pics/people/gym_leaders/brawly.png b/graphics/object_events/pics/people/gym_leaders/brawly.png similarity index 100% rename from graphics/event_objects/pics/people/gym_leaders/brawly.png rename to graphics/object_events/pics/people/gym_leaders/brawly.png diff --git a/graphics/event_objects/pics/people/gym_leaders/flannery.png b/graphics/object_events/pics/people/gym_leaders/flannery.png similarity index 100% rename from graphics/event_objects/pics/people/gym_leaders/flannery.png rename to graphics/object_events/pics/people/gym_leaders/flannery.png diff --git a/graphics/event_objects/pics/people/gym_leaders/juan.png b/graphics/object_events/pics/people/gym_leaders/juan.png similarity index 100% rename from graphics/event_objects/pics/people/gym_leaders/juan.png rename to graphics/object_events/pics/people/gym_leaders/juan.png diff --git a/graphics/event_objects/pics/people/gym_leaders/liza.png b/graphics/object_events/pics/people/gym_leaders/liza.png similarity index 100% rename from graphics/event_objects/pics/people/gym_leaders/liza.png rename to graphics/object_events/pics/people/gym_leaders/liza.png diff --git a/graphics/event_objects/pics/people/gym_leaders/norman.png b/graphics/object_events/pics/people/gym_leaders/norman.png similarity index 100% rename from graphics/event_objects/pics/people/gym_leaders/norman.png rename to graphics/object_events/pics/people/gym_leaders/norman.png diff --git a/graphics/event_objects/pics/people/gym_leaders/roxanne.png b/graphics/object_events/pics/people/gym_leaders/roxanne.png similarity index 100% rename from graphics/event_objects/pics/people/gym_leaders/roxanne.png rename to graphics/object_events/pics/people/gym_leaders/roxanne.png diff --git a/graphics/event_objects/pics/people/gym_leaders/tate.png b/graphics/object_events/pics/people/gym_leaders/tate.png similarity index 100% rename from graphics/event_objects/pics/people/gym_leaders/tate.png rename to graphics/object_events/pics/people/gym_leaders/tate.png diff --git a/graphics/event_objects/pics/people/gym_leaders/wattson.png b/graphics/object_events/pics/people/gym_leaders/wattson.png similarity index 100% rename from graphics/event_objects/pics/people/gym_leaders/wattson.png rename to graphics/object_events/pics/people/gym_leaders/wattson.png diff --git a/graphics/event_objects/pics/people/gym_leaders/winona.png b/graphics/object_events/pics/people/gym_leaders/winona.png similarity index 100% rename from graphics/event_objects/pics/people/gym_leaders/winona.png rename to graphics/object_events/pics/people/gym_leaders/winona.png diff --git a/graphics/event_objects/pics/people/hex_maniac.png b/graphics/object_events/pics/people/hex_maniac.png similarity index 100% rename from graphics/event_objects/pics/people/hex_maniac.png rename to graphics/object_events/pics/people/hex_maniac.png diff --git a/graphics/event_objects/pics/people/hiker.png b/graphics/object_events/pics/people/hiker.png similarity index 100% rename from graphics/event_objects/pics/people/hiker.png rename to graphics/object_events/pics/people/hiker.png diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman.png b/graphics/object_events/pics/people/hot_springs_old_woman.png similarity index 100% rename from graphics/event_objects/pics/people/hot_springs_old_woman.png rename to graphics/object_events/pics/people/hot_springs_old_woman.png diff --git a/graphics/event_objects/pics/people/lass.png b/graphics/object_events/pics/people/lass.png similarity index 100% rename from graphics/event_objects/pics/people/lass.png rename to graphics/object_events/pics/people/lass.png diff --git a/graphics/event_objects/pics/people/leaf.png b/graphics/object_events/pics/people/leaf.png similarity index 100% rename from graphics/event_objects/pics/people/leaf.png rename to graphics/object_events/pics/people/leaf.png diff --git a/graphics/event_objects/pics/people/link_receptionist.png b/graphics/object_events/pics/people/link_receptionist.png similarity index 100% rename from graphics/event_objects/pics/people/link_receptionist.png rename to graphics/object_events/pics/people/link_receptionist.png diff --git a/graphics/event_objects/pics/people/little_boy.png b/graphics/object_events/pics/people/little_boy.png similarity index 100% rename from graphics/event_objects/pics/people/little_boy.png rename to graphics/object_events/pics/people/little_boy.png diff --git a/graphics/event_objects/pics/people/little_girl.png b/graphics/object_events/pics/people/little_girl.png similarity index 100% rename from graphics/event_objects/pics/people/little_girl.png rename to graphics/object_events/pics/people/little_girl.png diff --git a/graphics/event_objects/pics/people/man_1.png b/graphics/object_events/pics/people/man_1.png similarity index 100% rename from graphics/event_objects/pics/people/man_1.png rename to graphics/object_events/pics/people/man_1.png diff --git a/graphics/event_objects/pics/people/man_2.png b/graphics/object_events/pics/people/man_2.png similarity index 100% rename from graphics/event_objects/pics/people/man_2.png rename to graphics/object_events/pics/people/man_2.png diff --git a/graphics/event_objects/pics/people/man_3.png b/graphics/object_events/pics/people/man_3.png similarity index 100% rename from graphics/event_objects/pics/people/man_3.png rename to graphics/object_events/pics/people/man_3.png diff --git a/graphics/event_objects/pics/people/man_4.png b/graphics/object_events/pics/people/man_4.png similarity index 100% rename from graphics/event_objects/pics/people/man_4.png rename to graphics/object_events/pics/people/man_4.png diff --git a/graphics/event_objects/pics/people/man_5.png b/graphics/object_events/pics/people/man_5.png similarity index 100% rename from graphics/event_objects/pics/people/man_5.png rename to graphics/object_events/pics/people/man_5.png diff --git a/graphics/event_objects/pics/people/maniac.png b/graphics/object_events/pics/people/maniac.png similarity index 100% rename from graphics/event_objects/pics/people/maniac.png rename to graphics/object_events/pics/people/maniac.png diff --git a/graphics/event_objects/pics/people/mart_employee.png b/graphics/object_events/pics/people/mart_employee.png similarity index 100% rename from graphics/event_objects/pics/people/mart_employee.png rename to graphics/object_events/pics/people/mart_employee.png diff --git a/graphics/event_objects/pics/people/mauville_old_man_1.png b/graphics/object_events/pics/people/mauville_old_man_1.png similarity index 100% rename from graphics/event_objects/pics/people/mauville_old_man_1.png rename to graphics/object_events/pics/people/mauville_old_man_1.png diff --git a/graphics/event_objects/pics/people/mauville_old_man_2.png b/graphics/object_events/pics/people/mauville_old_man_2.png similarity index 100% rename from graphics/event_objects/pics/people/mauville_old_man_2.png rename to graphics/object_events/pics/people/mauville_old_man_2.png diff --git a/graphics/event_objects/pics/people/may/acro_bike.png b/graphics/object_events/pics/people/may/acro_bike.png similarity index 100% rename from graphics/event_objects/pics/people/may/acro_bike.png rename to graphics/object_events/pics/people/may/acro_bike.png diff --git a/graphics/event_objects/pics/people/may/decorating.png b/graphics/object_events/pics/people/may/decorating.png similarity index 100% rename from graphics/event_objects/pics/people/may/decorating.png rename to graphics/object_events/pics/people/may/decorating.png diff --git a/graphics/event_objects/pics/people/may/field_move.png b/graphics/object_events/pics/people/may/field_move.png similarity index 100% rename from graphics/event_objects/pics/people/may/field_move.png rename to graphics/object_events/pics/people/may/field_move.png diff --git a/graphics/event_objects/pics/people/may/fishing.png b/graphics/object_events/pics/people/may/fishing.png similarity index 100% rename from graphics/event_objects/pics/people/may/fishing.png rename to graphics/object_events/pics/people/may/fishing.png diff --git a/graphics/event_objects/pics/people/may/mach_bike.png b/graphics/object_events/pics/people/may/mach_bike.png similarity index 100% rename from graphics/event_objects/pics/people/may/mach_bike.png rename to graphics/object_events/pics/people/may/mach_bike.png diff --git a/graphics/event_objects/pics/people/may/running.png b/graphics/object_events/pics/people/may/running.png similarity index 100% rename from graphics/event_objects/pics/people/may/running.png rename to graphics/object_events/pics/people/may/running.png diff --git a/graphics/event_objects/pics/people/may/surfing.png b/graphics/object_events/pics/people/may/surfing.png similarity index 100% rename from graphics/event_objects/pics/people/may/surfing.png rename to graphics/object_events/pics/people/may/surfing.png diff --git a/graphics/event_objects/pics/people/may/underwater.png b/graphics/object_events/pics/people/may/underwater.png similarity index 100% rename from graphics/event_objects/pics/people/may/underwater.png rename to graphics/object_events/pics/people/may/underwater.png diff --git a/graphics/event_objects/pics/people/may/walking.png b/graphics/object_events/pics/people/may/walking.png similarity index 100% rename from graphics/event_objects/pics/people/may/walking.png rename to graphics/object_events/pics/people/may/walking.png diff --git a/graphics/event_objects/pics/people/may/watering.png b/graphics/object_events/pics/people/may/watering.png similarity index 100% rename from graphics/event_objects/pics/people/may/watering.png rename to graphics/object_events/pics/people/may/watering.png diff --git a/graphics/event_objects/pics/people/mom.png b/graphics/object_events/pics/people/mom.png similarity index 100% rename from graphics/event_objects/pics/people/mom.png rename to graphics/object_events/pics/people/mom.png diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman.png b/graphics/object_events/pics/people/mystery_event_deliveryman.png similarity index 100% rename from graphics/event_objects/pics/people/mystery_event_deliveryman.png rename to graphics/object_events/pics/people/mystery_event_deliveryman.png diff --git a/graphics/event_objects/pics/people/ninja_boy.png b/graphics/object_events/pics/people/ninja_boy.png similarity index 100% rename from graphics/event_objects/pics/people/ninja_boy.png rename to graphics/object_events/pics/people/ninja_boy.png diff --git a/graphics/event_objects/pics/people/nurse.png b/graphics/object_events/pics/people/nurse.png similarity index 100% rename from graphics/event_objects/pics/people/nurse.png rename to graphics/object_events/pics/people/nurse.png diff --git a/graphics/event_objects/pics/people/old_man.png b/graphics/object_events/pics/people/old_man.png similarity index 100% rename from graphics/event_objects/pics/people/old_man.png rename to graphics/object_events/pics/people/old_man.png diff --git a/graphics/event_objects/pics/people/old_woman.png b/graphics/object_events/pics/people/old_woman.png similarity index 100% rename from graphics/event_objects/pics/people/old_woman.png rename to graphics/object_events/pics/people/old_woman.png diff --git a/graphics/event_objects/pics/people/picnicker.png b/graphics/object_events/pics/people/picnicker.png similarity index 100% rename from graphics/event_objects/pics/people/picnicker.png rename to graphics/object_events/pics/people/picnicker.png diff --git a/graphics/event_objects/pics/people/pokefan_f.png b/graphics/object_events/pics/people/pokefan_f.png similarity index 100% rename from graphics/event_objects/pics/people/pokefan_f.png rename to graphics/object_events/pics/people/pokefan_f.png diff --git a/graphics/event_objects/pics/people/pokefan_m.png b/graphics/object_events/pics/people/pokefan_m.png similarity index 100% rename from graphics/event_objects/pics/people/pokefan_m.png rename to graphics/object_events/pics/people/pokefan_m.png diff --git a/graphics/event_objects/pics/people/prof_birch.png b/graphics/object_events/pics/people/prof_birch.png similarity index 100% rename from graphics/event_objects/pics/people/prof_birch.png rename to graphics/object_events/pics/people/prof_birch.png diff --git a/graphics/event_objects/pics/people/psychic_m.png b/graphics/object_events/pics/people/psychic_m.png similarity index 100% rename from graphics/event_objects/pics/people/psychic_m.png rename to graphics/object_events/pics/people/psychic_m.png diff --git a/graphics/event_objects/pics/people/quinty_plump.png b/graphics/object_events/pics/people/quinty_plump.png similarity index 100% rename from graphics/event_objects/pics/people/quinty_plump.png rename to graphics/object_events/pics/people/quinty_plump.png diff --git a/graphics/event_objects/pics/people/red.png b/graphics/object_events/pics/people/red.png similarity index 100% rename from graphics/event_objects/pics/people/red.png rename to graphics/object_events/pics/people/red.png diff --git a/graphics/event_objects/pics/people/reporter_f.png b/graphics/object_events/pics/people/reporter_f.png similarity index 100% rename from graphics/event_objects/pics/people/reporter_f.png rename to graphics/object_events/pics/people/reporter_f.png diff --git a/graphics/event_objects/pics/people/reporter_m.png b/graphics/object_events/pics/people/reporter_m.png similarity index 100% rename from graphics/event_objects/pics/people/reporter_m.png rename to graphics/object_events/pics/people/reporter_m.png diff --git a/graphics/event_objects/pics/people/rich_boy.png b/graphics/object_events/pics/people/rich_boy.png similarity index 100% rename from graphics/event_objects/pics/people/rich_boy.png rename to graphics/object_events/pics/people/rich_boy.png diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman.png b/graphics/object_events/pics/people/rooftop_sale_woman.png similarity index 100% rename from graphics/event_objects/pics/people/rooftop_sale_woman.png rename to graphics/object_events/pics/people/rooftop_sale_woman.png diff --git a/graphics/event_objects/pics/people/rs_little_boy.png b/graphics/object_events/pics/people/rs_little_boy.png similarity index 100% rename from graphics/event_objects/pics/people/rs_little_boy.png rename to graphics/object_events/pics/people/rs_little_boy.png diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/running.png b/graphics/object_events/pics/people/ruby_sapphire_brendan/running.png similarity index 100% rename from graphics/event_objects/pics/people/ruby_sapphire_brendan/running.png rename to graphics/object_events/pics/people/ruby_sapphire_brendan/running.png diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png b/graphics/object_events/pics/people/ruby_sapphire_brendan/walking.png similarity index 100% rename from graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png rename to graphics/object_events/pics/people/ruby_sapphire_brendan/walking.png diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/running.png b/graphics/object_events/pics/people/ruby_sapphire_may/running.png similarity index 100% rename from graphics/event_objects/pics/people/ruby_sapphire_may/running.png rename to graphics/object_events/pics/people/ruby_sapphire_may/running.png diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/walking.png b/graphics/object_events/pics/people/ruby_sapphire_may/walking.png similarity index 100% rename from graphics/event_objects/pics/people/ruby_sapphire_may/walking.png rename to graphics/object_events/pics/people/ruby_sapphire_may/walking.png diff --git a/graphics/event_objects/pics/people/running_triathlete_f.png b/graphics/object_events/pics/people/running_triathlete_f.png similarity index 100% rename from graphics/event_objects/pics/people/running_triathlete_f.png rename to graphics/object_events/pics/people/running_triathlete_f.png diff --git a/graphics/event_objects/pics/people/running_triathlete_m.png b/graphics/object_events/pics/people/running_triathlete_m.png similarity index 100% rename from graphics/event_objects/pics/people/running_triathlete_m.png rename to graphics/object_events/pics/people/running_triathlete_m.png diff --git a/graphics/event_objects/pics/people/sailor.png b/graphics/object_events/pics/people/sailor.png similarity index 100% rename from graphics/event_objects/pics/people/sailor.png rename to graphics/object_events/pics/people/sailor.png diff --git a/graphics/event_objects/pics/people/school_kid_m.png b/graphics/object_events/pics/people/school_kid_m.png similarity index 100% rename from graphics/event_objects/pics/people/school_kid_m.png rename to graphics/object_events/pics/people/school_kid_m.png diff --git a/graphics/event_objects/pics/people/scientist_1.png b/graphics/object_events/pics/people/scientist_1.png similarity index 100% rename from graphics/event_objects/pics/people/scientist_1.png rename to graphics/object_events/pics/people/scientist_1.png diff --git a/graphics/event_objects/pics/people/scientist_2.png b/graphics/object_events/pics/people/scientist_2.png similarity index 100% rename from graphics/event_objects/pics/people/scientist_2.png rename to graphics/object_events/pics/people/scientist_2.png diff --git a/graphics/event_objects/pics/people/scott.png b/graphics/object_events/pics/people/scott.png similarity index 100% rename from graphics/event_objects/pics/people/scott.png rename to graphics/object_events/pics/people/scott.png diff --git a/graphics/event_objects/pics/people/steven.png b/graphics/object_events/pics/people/steven.png similarity index 100% rename from graphics/event_objects/pics/people/steven.png rename to graphics/object_events/pics/people/steven.png diff --git a/graphics/event_objects/pics/people/swimmer_f.png b/graphics/object_events/pics/people/swimmer_f.png similarity index 100% rename from graphics/event_objects/pics/people/swimmer_f.png rename to graphics/object_events/pics/people/swimmer_f.png diff --git a/graphics/event_objects/pics/people/swimmer_m.png b/graphics/object_events/pics/people/swimmer_m.png similarity index 100% rename from graphics/event_objects/pics/people/swimmer_m.png rename to graphics/object_events/pics/people/swimmer_m.png diff --git a/graphics/event_objects/pics/people/teala.png b/graphics/object_events/pics/people/teala.png similarity index 100% rename from graphics/event_objects/pics/people/teala.png rename to graphics/object_events/pics/people/teala.png diff --git a/graphics/event_objects/pics/people/team_aqua/aqua_member_f.png b/graphics/object_events/pics/people/team_aqua/aqua_member_f.png similarity index 100% rename from graphics/event_objects/pics/people/team_aqua/aqua_member_f.png rename to graphics/object_events/pics/people/team_aqua/aqua_member_f.png diff --git a/graphics/event_objects/pics/people/team_aqua/aqua_member_m.png b/graphics/object_events/pics/people/team_aqua/aqua_member_m.png similarity index 100% rename from graphics/event_objects/pics/people/team_aqua/aqua_member_m.png rename to graphics/object_events/pics/people/team_aqua/aqua_member_m.png diff --git a/graphics/event_objects/pics/people/team_aqua/archie.png b/graphics/object_events/pics/people/team_aqua/archie.png similarity index 100% rename from graphics/event_objects/pics/people/team_aqua/archie.png rename to graphics/object_events/pics/people/team_aqua/archie.png diff --git a/graphics/event_objects/pics/people/team_magma/magma_member_f.png b/graphics/object_events/pics/people/team_magma/magma_member_f.png similarity index 100% rename from graphics/event_objects/pics/people/team_magma/magma_member_f.png rename to graphics/object_events/pics/people/team_magma/magma_member_f.png diff --git a/graphics/event_objects/pics/people/team_magma/magma_member_m.png b/graphics/object_events/pics/people/team_magma/magma_member_m.png similarity index 100% rename from graphics/event_objects/pics/people/team_magma/magma_member_m.png rename to graphics/object_events/pics/people/team_magma/magma_member_m.png diff --git a/graphics/event_objects/pics/people/team_magma/maxie.png b/graphics/object_events/pics/people/team_magma/maxie.png similarity index 100% rename from graphics/event_objects/pics/people/team_magma/maxie.png rename to graphics/object_events/pics/people/team_magma/maxie.png diff --git a/graphics/event_objects/pics/people/tuber_f.png b/graphics/object_events/pics/people/tuber_f.png similarity index 100% rename from graphics/event_objects/pics/people/tuber_f.png rename to graphics/object_events/pics/people/tuber_f.png diff --git a/graphics/event_objects/pics/people/tuber_m.png b/graphics/object_events/pics/people/tuber_m.png similarity index 100% rename from graphics/event_objects/pics/people/tuber_m.png rename to graphics/object_events/pics/people/tuber_m.png diff --git a/graphics/event_objects/pics/people/tuber_m_swimming.png b/graphics/object_events/pics/people/tuber_m_swimming.png similarity index 100% rename from graphics/event_objects/pics/people/tuber_m_swimming.png rename to graphics/object_events/pics/people/tuber_m_swimming.png diff --git a/graphics/event_objects/pics/people/twin.png b/graphics/object_events/pics/people/twin.png similarity index 100% rename from graphics/event_objects/pics/people/twin.png rename to graphics/object_events/pics/people/twin.png diff --git a/graphics/event_objects/pics/people/union_room_attendant.png b/graphics/object_events/pics/people/union_room_attendant.png similarity index 100% rename from graphics/event_objects/pics/people/union_room_attendant.png rename to graphics/object_events/pics/people/union_room_attendant.png diff --git a/graphics/event_objects/pics/people/unused_woman.png b/graphics/object_events/pics/people/unused_woman.png similarity index 100% rename from graphics/event_objects/pics/people/unused_woman.png rename to graphics/object_events/pics/people/unused_woman.png diff --git a/graphics/event_objects/pics/people/wallace.png b/graphics/object_events/pics/people/wallace.png similarity index 100% rename from graphics/event_objects/pics/people/wallace.png rename to graphics/object_events/pics/people/wallace.png diff --git a/graphics/event_objects/pics/people/wally.png b/graphics/object_events/pics/people/wally.png similarity index 100% rename from graphics/event_objects/pics/people/wally.png rename to graphics/object_events/pics/people/wally.png diff --git a/graphics/event_objects/pics/people/woman_1.png b/graphics/object_events/pics/people/woman_1.png similarity index 100% rename from graphics/event_objects/pics/people/woman_1.png rename to graphics/object_events/pics/people/woman_1.png diff --git a/graphics/event_objects/pics/people/woman_2.png b/graphics/object_events/pics/people/woman_2.png similarity index 100% rename from graphics/event_objects/pics/people/woman_2.png rename to graphics/object_events/pics/people/woman_2.png diff --git a/graphics/event_objects/pics/people/woman_3.png b/graphics/object_events/pics/people/woman_3.png similarity index 100% rename from graphics/event_objects/pics/people/woman_3.png rename to graphics/object_events/pics/people/woman_3.png diff --git a/graphics/event_objects/pics/people/woman_4.png b/graphics/object_events/pics/people/woman_4.png similarity index 100% rename from graphics/event_objects/pics/people/woman_4.png rename to graphics/object_events/pics/people/woman_4.png diff --git a/graphics/event_objects/pics/people/woman_5.png b/graphics/object_events/pics/people/woman_5.png similarity index 100% rename from graphics/event_objects/pics/people/woman_5.png rename to graphics/object_events/pics/people/woman_5.png diff --git a/graphics/event_objects/pics/people/youngster.png b/graphics/object_events/pics/people/youngster.png similarity index 100% rename from graphics/event_objects/pics/people/youngster.png rename to graphics/object_events/pics/people/youngster.png diff --git a/graphics/event_objects/pics/pokemon/azumarill.png b/graphics/object_events/pics/pokemon/azumarill.png similarity index 100% rename from graphics/event_objects/pics/pokemon/azumarill.png rename to graphics/object_events/pics/pokemon/azumarill.png diff --git a/graphics/event_objects/pics/pokemon/azurill.png b/graphics/object_events/pics/pokemon/azurill.png similarity index 100% rename from graphics/event_objects/pics/pokemon/azurill.png rename to graphics/object_events/pics/pokemon/azurill.png diff --git a/graphics/event_objects/pics/pokemon/deoxys.png b/graphics/object_events/pics/pokemon/deoxys.png similarity index 100% rename from graphics/event_objects/pics/pokemon/deoxys.png rename to graphics/object_events/pics/pokemon/deoxys.png diff --git a/graphics/event_objects/pics/pokemon/dusclops.png b/graphics/object_events/pics/pokemon/dusclops.png similarity index 100% rename from graphics/event_objects/pics/pokemon/dusclops.png rename to graphics/object_events/pics/pokemon/dusclops.png diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png b/graphics/object_events/pics/pokemon/enemy_zigzagoon.png similarity index 100% rename from graphics/event_objects/pics/pokemon/enemy_zigzagoon.png rename to graphics/object_events/pics/pokemon/enemy_zigzagoon.png diff --git a/graphics/event_objects/pics/pokemon/groudon.png b/graphics/object_events/pics/pokemon/groudon.png similarity index 100% rename from graphics/event_objects/pics/pokemon/groudon.png rename to graphics/object_events/pics/pokemon/groudon.png diff --git a/graphics/event_objects/pics/pokemon/ho_oh.png b/graphics/object_events/pics/pokemon/ho_oh.png similarity index 100% rename from graphics/event_objects/pics/pokemon/ho_oh.png rename to graphics/object_events/pics/pokemon/ho_oh.png diff --git a/graphics/event_objects/pics/pokemon/kecleon.png b/graphics/object_events/pics/pokemon/kecleon.png similarity index 100% rename from graphics/event_objects/pics/pokemon/kecleon.png rename to graphics/object_events/pics/pokemon/kecleon.png diff --git a/graphics/event_objects/pics/pokemon/kirlia.png b/graphics/object_events/pics/pokemon/kirlia.png similarity index 100% rename from graphics/event_objects/pics/pokemon/kirlia.png rename to graphics/object_events/pics/pokemon/kirlia.png diff --git a/graphics/event_objects/pics/pokemon/kyogre.png b/graphics/object_events/pics/pokemon/kyogre.png similarity index 100% rename from graphics/event_objects/pics/pokemon/kyogre.png rename to graphics/object_events/pics/pokemon/kyogre.png diff --git a/graphics/event_objects/pics/pokemon/latias_latios.png b/graphics/object_events/pics/pokemon/latias_latios.png similarity index 100% rename from graphics/event_objects/pics/pokemon/latias_latios.png rename to graphics/object_events/pics/pokemon/latias_latios.png diff --git a/graphics/event_objects/pics/pokemon/lugia.png b/graphics/object_events/pics/pokemon/lugia.png similarity index 100% rename from graphics/event_objects/pics/pokemon/lugia.png rename to graphics/object_events/pics/pokemon/lugia.png diff --git a/graphics/event_objects/pics/pokemon/mew.png b/graphics/object_events/pics/pokemon/mew.png similarity index 100% rename from graphics/event_objects/pics/pokemon/mew.png rename to graphics/object_events/pics/pokemon/mew.png diff --git a/graphics/event_objects/pics/pokemon/pikachu.png b/graphics/object_events/pics/pokemon/pikachu.png similarity index 100% rename from graphics/event_objects/pics/pokemon/pikachu.png rename to graphics/object_events/pics/pokemon/pikachu.png diff --git a/graphics/event_objects/pics/pokemon/poochyena.png b/graphics/object_events/pics/pokemon/poochyena.png similarity index 100% rename from graphics/event_objects/pics/pokemon/poochyena.png rename to graphics/object_events/pics/pokemon/poochyena.png diff --git a/graphics/event_objects/pics/pokemon/rayquaza.png b/graphics/object_events/pics/pokemon/rayquaza.png similarity index 100% rename from graphics/event_objects/pics/pokemon/rayquaza.png rename to graphics/object_events/pics/pokemon/rayquaza.png diff --git a/graphics/event_objects/pics/pokemon/rayquaza_still.png b/graphics/object_events/pics/pokemon/rayquaza_still.png similarity index 100% rename from graphics/event_objects/pics/pokemon/rayquaza_still.png rename to graphics/object_events/pics/pokemon/rayquaza_still.png diff --git a/graphics/event_objects/pics/pokemon/regi.png b/graphics/object_events/pics/pokemon/regi.png similarity index 100% rename from graphics/event_objects/pics/pokemon/regi.png rename to graphics/object_events/pics/pokemon/regi.png diff --git a/graphics/event_objects/pics/pokemon/skitty.png b/graphics/object_events/pics/pokemon/skitty.png similarity index 100% rename from graphics/event_objects/pics/pokemon/skitty.png rename to graphics/object_events/pics/pokemon/skitty.png diff --git a/graphics/event_objects/pics/pokemon/sudowoodo.png b/graphics/object_events/pics/pokemon/sudowoodo.png similarity index 100% rename from graphics/event_objects/pics/pokemon/sudowoodo.png rename to graphics/object_events/pics/pokemon/sudowoodo.png diff --git a/graphics/event_objects/pics/pokemon/vigoroth.png b/graphics/object_events/pics/pokemon/vigoroth.png similarity index 100% rename from graphics/event_objects/pics/pokemon/vigoroth.png rename to graphics/object_events/pics/pokemon/vigoroth.png diff --git a/graphics/event_objects/pics/pokemon/wingull.png b/graphics/object_events/pics/pokemon/wingull.png similarity index 100% rename from graphics/event_objects/pics/pokemon/wingull.png rename to graphics/object_events/pics/pokemon/wingull.png diff --git a/graphics/event_objects/pics/pokemon/zigzagoon.png b/graphics/object_events/pics/pokemon/zigzagoon.png similarity index 100% rename from graphics/event_objects/pics/pokemon/zigzagoon.png rename to graphics/object_events/pics/pokemon/zigzagoon.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index fbdb6348cc..28351aa903 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -15,7 +15,7 @@ SLOTMACHINEGFXDIR := graphics/slot_machine PKNAVGFXDIR := graphics/pokenav PKNAVOPTIONSGFXDIR := graphics/pokenav/options PSSGFXDIR := graphics/pokemon_storage -EVENTOBJGFXDIR := graphics/event_objects +OBJEVENTGFXDIR := graphics/object_events MISCGFXDIR := graphics/misc types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark @@ -644,7 +644,7 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp @cat $^ >$@ -$(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 11 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 6e49a0a665..262d532327 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -1,663 +1,663 @@ -EVENTOBJGFXDIR := graphics/event_objects/pics +OBJEVENTGFXDIR := graphics/object_events/pics -$(EVENTOBJGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/running.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/running.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/elite_four/drake.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/elite_four/drake.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/elite_four/glacia.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/elite_four/glacia.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/elite_four/phoebe.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/elite_four/phoebe.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/elite_four/sidney.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/elite_four/sidney.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/anabel.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/anabel.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/brandon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/brandon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/greta.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/greta.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/lucy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/lucy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/noland.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/noland.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/spenser.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/spenser.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/tucker.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/tucker.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/brawly.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/brawly.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/flannery.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/flannery.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/juan.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/juan.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/liza.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/liza.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/norman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/norman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/roxanne.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/roxanne.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/tate.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/tate.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/wattson.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/wattson.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/winona.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/winona.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/walking.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/walking.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/running.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/running.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_aqua/aqua_member_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_aqua/aqua_member_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_aqua/archie.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_aqua/archie.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_magma/magma_member_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_magma/magma_member_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_magma/magma_member_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_magma/magma_member_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_magma/maxie.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_magma/maxie.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/artist.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/artist.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/beauty.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/beauty.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gameboy_kid.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gameboy_kid.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/camper.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/camper.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/cook.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cook.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/hiker.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/hiker.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/lass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/lass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/leaf.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/leaf.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/ninja_boy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/ninja_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/little_boy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/little_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/twin.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/twin.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/little_girl.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/little_girl.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/man_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/pokefan_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/pokefan_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_3.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_4.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_4.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_5.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_5.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/devon_employee.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/devon_employee.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/maniac.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/maniac.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mom.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mom.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/nurse.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/nurse.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/expert_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/expert_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_man.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/old_man.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/expert_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/expert_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_woman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/old_woman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/red.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/red.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/rs_little_boy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/rs_little_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/sailor.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/sailor.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/scott.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/scott.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/steven.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/steven.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/teala.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/teala.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/union_room_attendant.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/union_room_attendant.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/wallace.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/wallace.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/wally.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/wally.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/pokefan_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/pokefan_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/link_receptionist.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/link_receptionist.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/youngster.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/youngster.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(EVENTOBJGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/sudowoodo.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/sudowoodo.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/vigoroth.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/vigoroth.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/ash.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/ash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(EVENTOBJGFXDIR)/effects/bike_hop_tall_grass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/bike_hop_tall_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(EVENTOBJGFXDIR)/effects/bike_tire_tracks.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/bike_tire_tracks.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/effects/deep_sand_footprints.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/deep_sand_footprints.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/ground_impact_dust.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/ground_impact_dust.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(EVENTOBJGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/long_grass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/long_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/effects/sand_footprints.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/sand_footprints.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/effects/unknown_16.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_16.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_18.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_18.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_19.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_19.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_20.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_20.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_29.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_29.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(EVENTOBJGFXDIR)/effects/unknown_33.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_33.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_35.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_35.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unused_grass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unused_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 diff --git a/src/battle_transition.c b/src/battle_transition.c index df1d7b02be..0e719115fc 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -817,7 +817,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EBC = .callback = sub_8148380 }; -static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_10.gbapal"); +static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_10.gbapal"); const struct SpritePalette gFieldEffectObjectPaletteInfo10 = { diff --git a/src/data/event_object/event_object_graphics.h b/src/data/event_object/event_object_graphics.h deleted file mode 100755 index 28d62262d9..0000000000 --- a/src/data/event_object/event_object_graphics.h +++ /dev/null @@ -1,362 +0,0 @@ -const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp"); -const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp"); -const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_08.gbapal"); -const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp"); -const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp"); -const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_33.gbapal"); -const u16 NullPalette_8499A38[16] = {}; -const u16 NullPalette_8499A58[16] = {}; -const u16 NullPalette_8499A78[16] = {}; -const u16 NullPalette_8499A98[16] = {}; -const u16 NullPalette_8499AB8[16] = {}; -const u16 NullPalette_8499AD8[16] = {}; -const u16 NullPalette_8499AF8[16] = {}; -const u16 NullPalette_8499B18[16] = {}; -const u16 NullPalette_8499B38[16] = {}; -const u16 NullPalette_8499B58[16] = {}; -const u16 NullPalette_8499B78[16] = {}; -const u16 NullPalette_8499B98[16] = {}; -const u16 NullPalette_8499BB8[16] = {}; -const u16 NullPalette_8499BD8[16] = {}; -const u16 NullPalette_8499BF8[16] = {}; -const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_09.gbapal"); -const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_10.gbapal"); -const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); -const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); -const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); -const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp"); -const u32 gObjectEventPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp"); -const u32 gObjectEventPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); -const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); -const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); -const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); -const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); -const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_11.gbapal"); -const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp"); -const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp"); -const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_17.gbapal"); -const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_18.gbapal"); -const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp"); -const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp"); -const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_34.gbapal"); -const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); -const u16 NullPalette_84A54F8[16] = {}; -const u16 NullPalette_84A5518[16] = {}; -const u16 NullPalette_84A5538[16] = {}; -const u16 NullPalette_84A5558[16] = {}; -const u16 NullPalette_84A5578[16] = {}; -const u16 NullPalette_84A5598[16] = {}; -const u16 NullPalette_84A55B8[16] = {}; -const u16 NullPalette_84A55D8[16] = {}; -const u16 NullPalette_84A55F8[16] = {}; -const u16 NullPalette_84A5618[16] = {}; -const u16 NullPalette_84A5638[16] = {}; -const u16 NullPalette_84A5658[16] = {}; -const u16 NullPalette_84A5678[16] = {}; -const u16 NullPalette_84A5698[16] = {}; -const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); -const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); -const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); -const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); -const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); -const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); -const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_00.gbapal"); -const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_01.gbapal"); -const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_02.gbapal"); -const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_03.gbapal"); -const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_04.gbapal"); -const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_05.gbapal"); -const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_06.gbapal"); -const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_07.gbapal"); -const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp"); -const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp"); -const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); -const u32 gObjectEventPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); -const u32 gObjectEventPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); -const u32 gObjectEventPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); -const u32 gObjectEventPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp"); -const u32 gObjectEventPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp"); -const u32 gObjectEventPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); -const u32 gObjectEventPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); -const u32 gObjectEventPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp"); -const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); -const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); -const u32 gObjectEventPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp"); -const u32 gObjectEventPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); -const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); -const u32 gObjectEventPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp"); -const u32 gObjectEventPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp"); -const u32 gObjectEventPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); -const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); -const u32 gObjectEventPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp"); -const u32 gObjectEventPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); -const u32 gObjectEventPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); -const u32 gObjectEventPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp"); -const u32 gObjectEventPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp"); -const u32 gObjectEventPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp"); -const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); -const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); -const u32 gObjectEventPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); -const u32 gObjectEventPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); -const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); -const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); -const u32 gObjectEventPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); -const u32 gObjectEventPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); -const u32 gObjectEventPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp"); -const u32 gObjectEventPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp"); -const u32 gObjectEventPic_UnusedWoman[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman.4bpp"); -const u32 gObjectEventPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp"); -const u32 gObjectEventPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp"); -const u32 gObjectEventPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp"); -const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp"); -const u32 gObjectEventPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp"); -const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp"); -const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp"); -const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp"); -const u32 gObjectEventPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp"); -const u32 gObjectEventPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp"); -const u32 gObjectEventPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp"); -const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp"); -const u32 gObjectEventPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp"); -const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); -const u32 gObjectEventPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); -const u32 gObjectEventPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); -const u32 gObjectEventPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); -const u32 gObjectEventPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); -const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); -const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); -const u32 gObjectEventPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); -const u32 gObjectEventPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp"); -const u32 gObjectEventPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp"); -const u32 gObjectEventPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp"); -const u32 gObjectEventPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp"); -const u32 gObjectEventPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp"); -const u32 gObjectEventPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp"); -const u32 gObjectEventPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp"); -const u32 gObjectEventPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); -const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); -const u32 gObjectEventPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); -const u32 gObjectEventPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp"); -const u32 gObjectEventPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp"); -const u32 gObjectEventPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp"); -const u32 gObjectEventPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp"); -const u32 gObjectEventPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_f.4bpp"); -const u32 gObjectEventPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/sidney.4bpp"); -const u32 gObjectEventPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/phoebe.4bpp"); -const u32 gObjectEventPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/glacia.4bpp"); -const u32 gObjectEventPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/drake.4bpp"); -const u32 gObjectEventPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/roxanne.4bpp"); -const u32 gObjectEventPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/brawly.4bpp"); -const u32 gObjectEventPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/wattson.4bpp"); -const u32 gObjectEventPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/flannery.4bpp"); -const u32 gObjectEventPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/norman.4bpp"); -const u32 gObjectEventPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/winona.4bpp"); -const u32 gObjectEventPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/liza.4bpp"); -const u32 gObjectEventPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/tate.4bpp"); -const u32 gObjectEventPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp"); -const u32 gObjectEventPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp"); -const u32 gObjectEventPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); -const u32 gObjectEventPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp"); -const u32 gObjectEventPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); -const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); -const u32 gObjectEventPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp"); -const u32 gObjectEventPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); -const u32 gObjectEventPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp"); -const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp"); -const u32 gObjectEventPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); -const u32 gObjectEventPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); -const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); -const u32 gObjectEventPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); -const u32 gObjectEventPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); -const u32 gObjectEventPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); -const u32 gObjectEventPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp"); -const u32 gObjectEventPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); -const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); -const u32 gObjectEventPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); -const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); -const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); -const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); -const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); -const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_22.gbapal"); -const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_23.gbapal"); -const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_24.gbapal"); -const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_25.gbapal"); -const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); -const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); -const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); -const u32 gObjectEventPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp"); -const u32 gObjectEventPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp"); -const u32 gObjectEventPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp"); -const u32 gObjectEventPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp"); -const u32 gObjectEventPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp"); -const u32 gObjectEventPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp"); -const u32 gObjectEventPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp"); -const u32 gObjectEventPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp"); -const u32 gObjectEventPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp"); -const u32 gObjectEventPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp"); -const u32 gObjectEventPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp"); -const u32 gObjectEventPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp"); -const u32 gObjectEventPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp"); -const u32 gObjectEventPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp"); -const u32 gObjectEventPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp"); -const u32 gObjectEventPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp"); -const u32 gObjectEventPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp"); -const u32 gObjectEventPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp"); -const u32 gObjectEventPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp"); -const u32 gObjectEventPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp"); -const u32 gObjectEventPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp"); -const u32 gObjectEventPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp"); -const u32 gObjectEventPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp"); -const u32 gObjectEventPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp"); -const u32 gObjectEventPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp"); -const u32 gObjectEventPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp"); -const u32 gObjectEventPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp"); -const u32 gObjectEventPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp"); -const u32 gObjectEventPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp"); -const u32 gObjectEventPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp"); -const u32 gObjectEventPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp"); -const u32 gObjectEventPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp"); -const u32 gObjectEventPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp"); -const u32 gObjectEventPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp"); -const u32 gObjectEventPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp"); -const u32 gObjectEventPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp"); -const u32 gObjectEventPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp"); -const u32 gObjectEventPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp"); -const u32 gObjectEventPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp"); -const u32 gObjectEventPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp"); -const u32 gObjectEventPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp"); -const u32 gObjectEventPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp"); -const u32 gObjectEventPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp"); -const u32 gObjectEventPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp"); -const u32 gObjectEventPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp"); -const u32 gObjectEventPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); -const u32 gObjectEventPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); -const u32 gObjectEventPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); -const u32 gObjectEventPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); -const u32 gObjectEventPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); -const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); -const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); -const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); -const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); -const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_26.gbapal"); -const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); -const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_14.gbapal"); -const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp"); -const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_15.gbapal"); -const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); -const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp"); -const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_16.gbapal"); -const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); -const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_27.gbapal"); -const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); -const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_20.gbapal"); -const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); -const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_21.gbapal"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle.4bpp"); -const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); -const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); -const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp"); -const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp"); -const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp"); -const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp"); -const u32 gObjectEventPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp"); -const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp"); -const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp"); -const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp"); -const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp"); -const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp"); -const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp"); -const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp"); -const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp"); -const u32 gObjectEventPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp"); -const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp"); -const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp"); -const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp"); -const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp"); -const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp"); -const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp"); -const u32 gObjectEventPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp"); -const u32 gObjectEventPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp"); -const u32 gObjectEventPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp"); -const u32 gObjectEventPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp"); -const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp"); -const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp"); -const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp"); -const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); -const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); -const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); -const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp"); -const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); -const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_12.gbapal"); -const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_13.gbapal"); -const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp"); -const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp"); -const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp"); -const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_extra_large.4bpp"); -const u32 filler_8368A08[0x48] = {}; -const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/event_objects/pics/effects/cut_grass.4bpp"); -const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/event_objects/pics/effects/cut_grass.4bpp"); -const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_06.gbapal"); -const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple.4bpp"); -const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/event_objects/pics/effects/ash.4bpp"); -const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow.4bpp"); -const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_00.gbapal"); -const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_01.gbapal"); -const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass.4bpp"); -const u32 gUnusedGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17.4bpp"); -const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18.4bpp"); -const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass.4bpp"); -const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass.4bpp"); -const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints.4bpp"); -const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19.4bpp"); -const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash.4bpp"); -const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/event_objects/pics/effects/splash.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder.4bpp"); -const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/event_objects/pics/effects/hot_springs_water.4bpp"); -const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_02.gbapal"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash.4bpp"); -const u32 gFieldEffectObjectPic_Unknown33[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles.4bpp"); -const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp"); -const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal"); -const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp"); -const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp"); -const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp"); -const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp"); -const u32 gObjectEventPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp"); -const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp"); -const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp"); -const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp"); -const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); -const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_19.gbapal"); -const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp"); -const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp"); -const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_28.gbapal"); -const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp"); -const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp"); -const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_30.gbapal"); -const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); -const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_29.gbapal"); -const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp"); -const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp"); -const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp"); -const u32 gObjectEventPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp"); -const u32 gObjectEventPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/greta.4bpp"); -const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp"); -const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp"); -const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp"); -const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp"); -const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_32.gbapal"); -const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); -const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_31.gbapal"); diff --git a/src/data/event_object/base_oam.h b/src/data/object_event/base_oam.h similarity index 100% rename from src/data/event_object/base_oam.h rename to src/data/object_event/base_oam.h diff --git a/src/data/event_object/berry_tree_graphics_tables.h b/src/data/object_event/berry_tree_graphics_tables.h similarity index 100% rename from src/data/event_object/berry_tree_graphics_tables.h rename to src/data/object_event/berry_tree_graphics_tables.h diff --git a/src/data/event_object/event_object_anims.h b/src/data/object_event/event_object_anims.h similarity index 100% rename from src/data/event_object/event_object_anims.h rename to src/data/object_event/event_object_anims.h diff --git a/src/data/object_event/event_object_graphics.h b/src/data/object_event/event_object_graphics.h new file mode 100755 index 0000000000..764c00ea2d --- /dev/null +++ b/src/data/object_event/event_object_graphics.h @@ -0,0 +1,362 @@ +const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/walking.4bpp"); +const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/brendan/running.4bpp"); +const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_08.gbapal"); +const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp"); +const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp"); +const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_33.gbapal"); +const u16 NullPalette_8499A38[16] = {}; +const u16 NullPalette_8499A58[16] = {}; +const u16 NullPalette_8499A78[16] = {}; +const u16 NullPalette_8499A98[16] = {}; +const u16 NullPalette_8499AB8[16] = {}; +const u16 NullPalette_8499AD8[16] = {}; +const u16 NullPalette_8499AF8[16] = {}; +const u16 NullPalette_8499B18[16] = {}; +const u16 NullPalette_8499B38[16] = {}; +const u16 NullPalette_8499B58[16] = {}; +const u16 NullPalette_8499B78[16] = {}; +const u16 NullPalette_8499B98[16] = {}; +const u16 NullPalette_8499BB8[16] = {}; +const u16 NullPalette_8499BD8[16] = {}; +const u16 NullPalette_8499BF8[16] = {}; +const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_09.gbapal"); +const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_10.gbapal"); +const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/brendan/field_move.4bpp"); +const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/surfing.4bpp"); +const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/mach_bike.4bpp"); +const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/acro_bike.4bpp"); +const u32 gObjectEventPic_BrendanFishing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/fishing.4bpp"); +const u32 gObjectEventPic_BrendanWatering[] = INCBIN_U32("graphics/object_events/pics/people/brendan/watering.4bpp"); +const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/object_events/pics/people/brendan/decorating.4bpp"); +const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/object_events/pics/people/may/decorating.4bpp"); +const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/brendan/underwater.4bpp"); +const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/may/underwater.4bpp"); +const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_11.gbapal"); +const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/walking.4bpp"); +const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/object_events/pics/people/may/running.4bpp"); +const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_17.gbapal"); +const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_18.gbapal"); +const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/walking.4bpp"); +const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp"); +const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_34.gbapal"); +const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/object_events/palettes/unused_palette.gbapal"); +const u16 NullPalette_84A54F8[16] = {}; +const u16 NullPalette_84A5518[16] = {}; +const u16 NullPalette_84A5538[16] = {}; +const u16 NullPalette_84A5558[16] = {}; +const u16 NullPalette_84A5578[16] = {}; +const u16 NullPalette_84A5598[16] = {}; +const u16 NullPalette_84A55B8[16] = {}; +const u16 NullPalette_84A55D8[16] = {}; +const u16 NullPalette_84A55F8[16] = {}; +const u16 NullPalette_84A5618[16] = {}; +const u16 NullPalette_84A5638[16] = {}; +const u16 NullPalette_84A5658[16] = {}; +const u16 NullPalette_84A5678[16] = {}; +const u16 NullPalette_84A5698[16] = {}; +const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/object_events/pics/people/may/mach_bike.4bpp"); +const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/may/acro_bike.4bpp"); +const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/object_events/pics/people/may/surfing.4bpp"); +const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/may/field_move.4bpp"); +const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/object_events/pics/people/may/fishing.4bpp"); +const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/object_events/pics/people/may/watering.4bpp"); +const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_00.gbapal"); +const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_01.gbapal"); +const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_02.gbapal"); +const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_03.gbapal"); +const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_04.gbapal"); +const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_05.gbapal"); +const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_06.gbapal"); +const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_07.gbapal"); +const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/object_events/pics/people/ninja_boy.4bpp"); +const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/object_events/pics/people/twin.4bpp"); +const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/object_events/pics/people/boy_1.4bpp"); +const u32 gObjectEventPic_Girl1[] = INCBIN_U32("graphics/object_events/pics/people/girl_1.4bpp"); +const u32 gObjectEventPic_Boy2[] = INCBIN_U32("graphics/object_events/pics/people/boy_2.4bpp"); +const u32 gObjectEventPic_Girl2[] = INCBIN_U32("graphics/object_events/pics/people/girl_2.4bpp"); +const u32 gObjectEventPic_LittleBoy[] = INCBIN_U32("graphics/object_events/pics/people/little_boy.4bpp"); +const u32 gObjectEventPic_LittleGirl[] = INCBIN_U32("graphics/object_events/pics/people/little_girl.4bpp"); +const u32 gObjectEventPic_Boy3[] = INCBIN_U32("graphics/object_events/pics/people/boy_3.4bpp"); +const u32 gObjectEventPic_Girl3[] = INCBIN_U32("graphics/object_events/pics/people/girl_3.4bpp"); +const u32 gObjectEventPic_RichBoy[] = INCBIN_U32("graphics/object_events/pics/people/rich_boy.4bpp"); +const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/object_events/pics/people/woman_1.4bpp"); +const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/object_events/pics/people/fat_man.4bpp"); +const u32 gObjectEventPic_PokefanF[] = INCBIN_U32("graphics/object_events/pics/people/pokefan_f.4bpp"); +const u32 gObjectEventPic_Man1[] = INCBIN_U32("graphics/object_events/pics/people/man_1.4bpp"); +const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/object_events/pics/people/woman_2.4bpp"); +const u32 gObjectEventPic_ExpertM[] = INCBIN_U32("graphics/object_events/pics/people/expert_m.4bpp"); +const u32 gObjectEventPic_ExpertF[] = INCBIN_U32("graphics/object_events/pics/people/expert_f.4bpp"); +const u32 gObjectEventPic_Man2[] = INCBIN_U32("graphics/object_events/pics/people/man_2.4bpp"); +const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/object_events/pics/people/woman_3.4bpp"); +const u32 gObjectEventPic_PokefanM[] = INCBIN_U32("graphics/object_events/pics/people/pokefan_m.4bpp"); +const u32 gObjectEventPic_Woman4[] = INCBIN_U32("graphics/object_events/pics/people/woman_4.4bpp"); +const u32 gObjectEventPic_Cook[] = INCBIN_U32("graphics/object_events/pics/people/cook.4bpp"); +const u32 gObjectEventPic_LinkReceptionist[] = INCBIN_U32("graphics/object_events/pics/people/link_receptionist.4bpp"); +const u32 gObjectEventPic_OldMan[] = INCBIN_U32("graphics/object_events/pics/people/old_man.4bpp"); +const u32 gObjectEventPic_OldWoman[] = INCBIN_U32("graphics/object_events/pics/people/old_woman.4bpp"); +const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/object_events/pics/people/camper.4bpp"); +const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/object_events/pics/people/picnicker.4bpp"); +const u32 gObjectEventPic_Man3[] = INCBIN_U32("graphics/object_events/pics/people/man_3.4bpp"); +const u32 gObjectEventPic_Woman5[] = INCBIN_U32("graphics/object_events/pics/people/woman_5.4bpp"); +const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/object_events/pics/people/youngster.4bpp"); +const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/object_events/pics/people/bug_catcher.4bpp"); +const u32 gObjectEventPic_PsychicM[] = INCBIN_U32("graphics/object_events/pics/people/psychic_m.4bpp"); +const u32 gObjectEventPic_SchoolKidM[] = INCBIN_U32("graphics/object_events/pics/people/school_kid_m.4bpp"); +const u32 gObjectEventPic_Maniac[] = INCBIN_U32("graphics/object_events/pics/people/maniac.4bpp"); +const u32 gObjectEventPic_HexManiac[] = INCBIN_U32("graphics/object_events/pics/people/hex_maniac.4bpp"); +const u32 gObjectEventPic_UnusedWoman[] = INCBIN_U32("graphics/object_events/pics/people/unused_woman.4bpp"); +const u32 gObjectEventPic_SwimmerM[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_m.4bpp"); +const u32 gObjectEventPic_SwimmerF[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_f.4bpp"); +const u32 gObjectEventPic_BlackBelt[] = INCBIN_U32("graphics/object_events/pics/people/black_belt.4bpp"); +const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/object_events/pics/people/beauty.4bpp"); +const u32 gObjectEventPic_Scientist1[] = INCBIN_U32("graphics/object_events/pics/people/scientist_1.4bpp"); +const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/object_events/pics/people/lass.4bpp"); +const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/object_events/pics/people/gentleman.4bpp"); +const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/object_events/pics/people/sailor.4bpp"); +const u32 gObjectEventPic_Fisherman[] = INCBIN_U32("graphics/object_events/pics/people/fisherman.4bpp"); +const u32 gObjectEventPic_RunningTriathleteM[] = INCBIN_U32("graphics/object_events/pics/people/running_triathlete_m.4bpp"); +const u32 gObjectEventPic_RunningTriathleteF[] = INCBIN_U32("graphics/object_events/pics/people/running_triathlete_f.4bpp"); +const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/object_events/pics/people/tuber_f.4bpp"); +const u32 gObjectEventPic_TuberM[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m.4bpp"); +const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/object_events/pics/people/hiker.4bpp"); +const u32 gObjectEventPic_CyclingTriathleteM[] = INCBIN_U32("graphics/object_events/pics/people/cycling_triathlete_m.4bpp"); +const u32 gObjectEventPic_CyclingTriathleteF[] = INCBIN_U32("graphics/object_events/pics/people/cycling_triathlete_f.4bpp"); +const u32 gObjectEventPic_Man4[] = INCBIN_U32("graphics/object_events/pics/people/man_4.4bpp"); +const u32 gObjectEventPic_Man5[] = INCBIN_U32("graphics/object_events/pics/people/man_5.4bpp"); +const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/object_events/pics/people/nurse.4bpp"); +const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/object_events/pics/misc/item_ball.4bpp"); +const u32 gObjectEventPic_ProfBirch[] = INCBIN_U32("graphics/object_events/pics/people/prof_birch.4bpp"); +const u32 gObjectEventPic_ReporterM[] = INCBIN_U32("graphics/object_events/pics/people/reporter_m.4bpp"); +const u32 gObjectEventPic_ReporterF[] = INCBIN_U32("graphics/object_events/pics/people/reporter_f.4bpp"); +const u32 gObjectEventPic_MauvilleOldMan1[] = INCBIN_U32("graphics/object_events/pics/people/mauville_old_man_1.4bpp"); +const u32 gObjectEventPic_MauvilleOldMan2[] = INCBIN_U32("graphics/object_events/pics/people/mauville_old_man_2.4bpp"); +const u32 gObjectEventPic_MartEmployee[] = INCBIN_U32("graphics/object_events/pics/people/mart_employee.4bpp"); +const u32 gObjectEventPic_RooftopSaleWoman[] = INCBIN_U32("graphics/object_events/pics/people/rooftop_sale_woman.4bpp"); +const u32 gObjectEventPic_Teala[] = INCBIN_U32("graphics/object_events/pics/people/teala.4bpp"); +const u32 gObjectEventPic_Artist[] = INCBIN_U32("graphics/object_events/pics/people/artist.4bpp"); +const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/object_events/pics/people/cameraman.4bpp"); +const u32 gObjectEventPic_Scientist2[] = INCBIN_U32("graphics/object_events/pics/people/scientist_2.4bpp"); +const u32 gObjectEventPic_DevonEmployee[] = INCBIN_U32("graphics/object_events/pics/people/devon_employee.4bpp"); +const u32 gObjectEventPic_AquaMemberM[] = INCBIN_U32("graphics/object_events/pics/people/team_aqua/aqua_member_m.4bpp"); +const u32 gObjectEventPic_AquaMemberF[] = INCBIN_U32("graphics/object_events/pics/people/team_aqua/aqua_member_f.4bpp"); +const u32 gObjectEventPic_MagmaMemberM[] = INCBIN_U32("graphics/object_events/pics/people/team_magma/magma_member_m.4bpp"); +const u32 gObjectEventPic_MagmaMemberF[] = INCBIN_U32("graphics/object_events/pics/people/team_magma/magma_member_f.4bpp"); +const u32 gObjectEventPic_Sidney[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/sidney.4bpp"); +const u32 gObjectEventPic_Phoebe[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/phoebe.4bpp"); +const u32 gObjectEventPic_Glacia[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/glacia.4bpp"); +const u32 gObjectEventPic_Drake[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/drake.4bpp"); +const u32 gObjectEventPic_Roxanne[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/roxanne.4bpp"); +const u32 gObjectEventPic_Brawly[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/brawly.4bpp"); +const u32 gObjectEventPic_Wattson[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/wattson.4bpp"); +const u32 gObjectEventPic_Flannery[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/flannery.4bpp"); +const u32 gObjectEventPic_Norman[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/norman.4bpp"); +const u32 gObjectEventPic_Winona[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/winona.4bpp"); +const u32 gObjectEventPic_Liza[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/liza.4bpp"); +const u32 gObjectEventPic_Tate[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/tate.4bpp"); +const u32 gObjectEventPic_Wallace[] = INCBIN_U32("graphics/object_events/pics/people/wallace.4bpp"); +const u32 gObjectEventPic_Steven[] = INCBIN_U32("graphics/object_events/pics/people/steven.4bpp"); +const u32 gObjectEventPic_Wally[] = INCBIN_U32("graphics/object_events/pics/people/wally.4bpp"); +const u32 gObjectEventPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/object_events/pics/people/rs_little_boy.4bpp"); +const u32 gObjectEventPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/object_events/pics/people/hot_springs_old_woman.4bpp"); +const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/object_events/pics/pokemon/latias_latios.4bpp"); +const u32 gObjectEventPic_GameboyKid[] = INCBIN_U32("graphics/object_events/pics/people/gameboy_kid.4bpp"); +const u32 gObjectEventPic_ContestJudge[] = INCBIN_U32("graphics/object_events/pics/people/contest_judge.4bpp"); +const u32 gObjectEventPic_Archie[] = INCBIN_U32("graphics/object_events/pics/people/team_aqua/archie.4bpp"); +const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/object_events/pics/people/team_magma/maxie.4bpp"); +const u32 gObjectEventPic_Kyogre[] = INCBIN_U32("graphics/object_events/pics/pokemon/kyogre.4bpp"); +const u32 gObjectEventPic_Groudon[] = INCBIN_U32("graphics/object_events/pics/pokemon/groudon.4bpp"); +const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/object_events/pics/pokemon/regi.4bpp"); +const u32 gObjectEventPic_Skitty[] = INCBIN_U32("graphics/object_events/pics/pokemon/skitty.4bpp"); +const u32 gObjectEventPic_Kecleon[] = INCBIN_U32("graphics/object_events/pics/pokemon/kecleon.4bpp"); +const u32 gObjectEventPic_Rayquaza[] = INCBIN_U32("graphics/object_events/pics/pokemon/rayquaza.4bpp"); +const u32 gObjectEventPic_RayquazaStill[] = INCBIN_U32("graphics/object_events/pics/pokemon/rayquaza_still.4bpp"); +const u32 gObjectEventPic_Zigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/zigzagoon.4bpp"); +const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/object_events/pics/pokemon/pikachu.4bpp"); +const u32 gObjectEventPic_Azumarill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azumarill.4bpp"); +const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/object_events/pics/pokemon/wingull.4bpp"); +const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_swimming.4bpp"); +const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azurill.4bpp"); +const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/object_events/pics/people/mom.4bpp"); +const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_22.gbapal"); +const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_23.gbapal"); +const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_24.gbapal"); +const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_25.gbapal"); +const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_natu_doll.4bpp"); +const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_magnemite_doll.4bpp"); +const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_squirtle_doll.4bpp"); +const u32 gObjectEventPic_UnusedWooperDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_wooper_doll.4bpp"); +const u32 gObjectEventPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_pikachu_doll.4bpp"); +const u32 gObjectEventPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_porygon2_doll.4bpp"); +const u32 gObjectEventPic_PichuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/pichu_doll.4bpp"); +const u32 gObjectEventPic_PikachuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/pikachu_doll.4bpp"); +const u32 gObjectEventPic_MarillDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/marill_doll.4bpp"); +const u32 gObjectEventPic_TogepiDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/togepi_doll.4bpp"); +const u32 gObjectEventPic_CyndaquilDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/cyndaquil_doll.4bpp"); +const u32 gObjectEventPic_ChikoritaDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/chikorita_doll.4bpp"); +const u32 gObjectEventPic_TotodileDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/totodile_doll.4bpp"); +const u32 gObjectEventPic_JigglypuffDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/jigglypuff_doll.4bpp"); +const u32 gObjectEventPic_MeowthDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/meowth_doll.4bpp"); +const u32 gObjectEventPic_ClefairyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/clefairy_doll.4bpp"); +const u32 gObjectEventPic_DittoDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/ditto_doll.4bpp"); +const u32 gObjectEventPic_SmoochumDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/smoochum_doll.4bpp"); +const u32 gObjectEventPic_TreeckoDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/treecko_doll.4bpp"); +const u32 gObjectEventPic_TorchicDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/torchic_doll.4bpp"); +const u32 gObjectEventPic_MudkipDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/mudkip_doll.4bpp"); +const u32 gObjectEventPic_DuskullDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/duskull_doll.4bpp"); +const u32 gObjectEventPic_WynautDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/wynaut_doll.4bpp"); +const u32 gObjectEventPic_BaltoyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/baltoy_doll.4bpp"); +const u32 gObjectEventPic_KecleonDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/kecleon_doll.4bpp"); +const u32 gObjectEventPic_AzurillDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/azurill_doll.4bpp"); +const u32 gObjectEventPic_SkittyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/skitty_doll.4bpp"); +const u32 gObjectEventPic_SwabluDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/swablu_doll.4bpp"); +const u32 gObjectEventPic_GulpinDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/gulpin_doll.4bpp"); +const u32 gObjectEventPic_LotadDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/lotad_doll.4bpp"); +const u32 gObjectEventPic_SeedotDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/seedot_doll.4bpp"); +const u32 gObjectEventPic_PikaCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/pika_cushion.4bpp"); +const u32 gObjectEventPic_RoundCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/round_cushion.4bpp"); +const u32 gObjectEventPic_KissCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/kiss_cushion.4bpp"); +const u32 gObjectEventPic_ZigzagCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/zigzag_cushion.4bpp"); +const u32 gObjectEventPic_SpinCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/spin_cushion.4bpp"); +const u32 gObjectEventPic_DiamondCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/diamond_cushion.4bpp"); +const u32 gObjectEventPic_BallCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/ball_cushion.4bpp"); +const u32 gObjectEventPic_GrassCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/grass_cushion.4bpp"); +const u32 gObjectEventPic_FireCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/fire_cushion.4bpp"); +const u32 gObjectEventPic_WaterCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/water_cushion.4bpp"); +const u32 gObjectEventPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_snorlax_doll.4bpp"); +const u32 gObjectEventPic_BigRhydonDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_rhydon_doll.4bpp"); +const u32 gObjectEventPic_BigLaprasDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_lapras_doll.4bpp"); +const u32 gObjectEventPic_BigVenusaurDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_venusaur_doll.4bpp"); +const u32 gObjectEventPic_BigCharizardDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_charizard_doll.4bpp"); +const u32 gObjectEventPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_blastoise_doll.4bpp"); +const u32 gObjectEventPic_BigWailmerDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_wailmer_doll.4bpp"); +const u32 gObjectEventPic_BigRegirockDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_regirock_doll.4bpp"); +const u32 gObjectEventPic_BigRegiceDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_regice_doll.4bpp"); +const u32 gObjectEventPic_BigRegisteelDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_registeel_doll.4bpp"); +const u32 gObjectEventPic_CuttableTree[] = INCBIN_U32("graphics/object_events/pics/misc/cuttable_tree.4bpp"); +const u32 gObjectEventPic_BreakableRock[] = INCBIN_U32("graphics/object_events/pics/misc/breakable_rock.4bpp"); +const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/object_events/pics/misc/pushable_boulder.4bpp"); +const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/object_events/pics/misc/mr_brineys_boat.4bpp"); +const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/object_events/pics/misc/fossil.4bpp"); +const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/object_events/pics/misc/submarine_shadow.4bpp"); +const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_26.gbapal"); +const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/object_events/pics/misc/truck.4bpp"); +const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_14.gbapal"); +const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/object_events/pics/pokemon/vigoroth.4bpp"); +const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_15.gbapal"); +const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/object_events/pics/misc/birchs_bag.4bpp"); +const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/enemy_zigzagoon.4bpp"); +const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_16.gbapal"); +const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/object_events/pics/pokemon/poochyena.4bpp"); +const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_27.gbapal"); +const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/misc/cable_car.4bpp"); +const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_20.gbapal"); +const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/object_events/pics/misc/ss_tidal.4bpp"); +const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_21.gbapal"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/object_events/pics/effects/berry_tree_growth_sparkle.4bpp"); +const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp"); +const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp"); +const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp"); +const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/kelpsy.4bpp"); +const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wepear.4bpp"); +const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/iapapa.4bpp"); +const u32 gObjectEventPic_CheriBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cheri.4bpp"); +const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/figy.4bpp"); +const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/mago.4bpp"); +const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lum.4bpp"); +const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/razz.4bpp"); +const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/grepa.4bpp"); +const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rabuta.4bpp"); +const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/nomel.4bpp"); +const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/leppa.4bpp"); +const u32 gObjectEventPic_LiechiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/liechi.4bpp"); +const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/hondew.4bpp"); +const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aguav.4bpp"); +const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wiki.4bpp"); +const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pomeg.4bpp"); +const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rawst.4bpp"); +const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/spelon.4bpp"); +const u32 gObjectEventPic_ChestoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/chesto.4bpp"); +const u32 gObjectEventPic_OranBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/oran.4bpp"); +const u32 gObjectEventPic_PersimBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/persim.4bpp"); +const u32 gObjectEventPic_SitrusBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sitrus.4bpp"); +const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aspear.4bpp"); +const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pamtre.4bpp"); +const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cornn.4bpp"); +const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lansat.4bpp"); +const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/durin.4bpp"); +const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/tamato.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/object_events/pics/effects/surf_blob.4bpp"); +const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/object_events/pics/people/quinty_plump.4bpp"); +const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_12.gbapal"); +const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_13.gbapal"); +const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp"); +const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp"); +const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp"); +const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); +const u32 filler_8368A08[0x48] = {}; +const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/object_events/pics/effects/cut_grass.4bpp"); +const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/object_events/pics/effects/cut_grass.4bpp"); +const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_06.gbapal"); +const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/object_events/pics/effects/ripple.4bpp"); +const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/object_events/pics/effects/ash.4bpp"); +const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/object_events/pics/effects/arrow.4bpp"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_00.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_01.gbapal"); +const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/object_events/pics/effects/ground_impact_dust.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_tall_grass.4bpp"); +const u32 gUnusedGrass[] = INCBIN_U32("graphics/object_events/pics/effects/unused_grass.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_16.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_17.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_18.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/object_events/pics/effects/long_grass.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/tall_grass.4bpp"); +const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/object_events/pics/effects/short_grass.4bpp"); +const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/sand_footprints.4bpp"); +const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/deep_sand_footprints.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/object_events/pics/effects/bike_tire_tracks.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_19.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_29.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_big_splash.4bpp"); +const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/object_events/pics/effects/splash.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_small_splash.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_20.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/tree_disguise.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/mountain_disguise.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/object_events/pics/effects/sand_disguise_placeholder.4bpp"); +const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/object_events/pics/effects/hot_springs_water.4bpp"); +const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_02.gbapal"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/object_events/pics/effects/jump_out_of_ash.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_33.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/object_events/pics/effects/bubbles.4bpp"); +const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_35.4bpp"); +const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_03.gbapal"); +const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/object_events/pics/effects/bird.4bpp"); +const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp"); +const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/object_events/pics/people/scott.4bpp"); +const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/object_events/pics/misc/statue.4bpp"); +const u32 gObjectEventPic_Kirlia[] = INCBIN_U32("graphics/object_events/pics/pokemon/kirlia.4bpp"); +const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/object_events/pics/pokemon/dusclops.4bpp"); +const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/object_events/pics/people/mystery_event_deliveryman.4bpp"); +const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/object_events/pics/people/union_room_attendant.4bpp"); +const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/object_events/pics/misc/moving_box.4bpp"); +const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_19.gbapal"); +const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/object_events/pics/pokemon/sudowoodo.4bpp"); +const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/object_events/pics/pokemon/mew.4bpp"); +const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_28.gbapal"); +const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/object_events/pics/people/red.4bpp"); +const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/object_events/pics/people/leaf.4bpp"); +const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_30.gbapal"); +const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/object_events/pics/misc/birth_island_stone.4bpp"); +const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_29.gbapal"); +const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys.4bpp"); +const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/anabel.4bpp"); +const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/tucker.4bpp"); +const u32 gObjectEventPic_Spenser[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/spenser.4bpp"); +const u32 gObjectEventPic_Greta[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/greta.4bpp"); +const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/noland.4bpp"); +const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/lucy.4bpp"); +const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/brandon.4bpp"); +const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/object_events/pics/pokemon/lugia.4bpp"); +const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_32.gbapal"); +const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/object_events/pics/pokemon/ho_oh.4bpp"); +const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_31.gbapal"); diff --git a/src/data/event_object/event_object_graphics_info.h b/src/data/object_event/event_object_graphics_info.h similarity index 100% rename from src/data/event_object/event_object_graphics_info.h rename to src/data/object_event/event_object_graphics_info.h diff --git a/src/data/event_object/event_object_graphics_info_pointers.h b/src/data/object_event/event_object_graphics_info_pointers.h similarity index 100% rename from src/data/event_object/event_object_graphics_info_pointers.h rename to src/data/object_event/event_object_graphics_info_pointers.h diff --git a/src/data/event_object/event_object_pic_tables.h b/src/data/object_event/event_object_pic_tables.h similarity index 100% rename from src/data/event_object/event_object_pic_tables.h rename to src/data/object_event/event_object_pic_tables.h diff --git a/src/data/event_object/event_object_subsprites.h b/src/data/object_event/event_object_subsprites.h similarity index 100% rename from src/data/event_object/event_object_subsprites.h rename to src/data/object_event/event_object_subsprites.h diff --git a/src/data/event_object/field_effect_object_template_pointers.h b/src/data/object_event/field_effect_object_template_pointers.h similarity index 100% rename from src/data/event_object/field_effect_object_template_pointers.h rename to src/data/object_event/field_effect_object_template_pointers.h diff --git a/src/data/event_object/field_effect_objects.h b/src/data/object_event/field_effect_objects.h similarity index 100% rename from src/data/event_object/field_effect_objects.h rename to src/data/object_event/field_effect_objects.h diff --git a/src/data/event_object/movement_action_func_tables.h b/src/data/object_event/movement_action_func_tables.h similarity index 100% rename from src/data/event_object/movement_action_func_tables.h rename to src/data/object_event/movement_action_func_tables.h diff --git a/src/data/event_object/movement_type_func_tables.h b/src/data/object_event/movement_type_func_tables.h similarity index 100% rename from src/data/event_object/movement_type_func_tables.h rename to src/data/object_event/movement_type_func_tables.h diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 86999f2650..6155c430a2 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -140,7 +140,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_2, }; -#include "data/event_object/event_object_graphics.h" +#include "data/object_event/event_object_graphics.h" // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = @@ -433,13 +433,13 @@ const u8 gInitialMovementTypeFacingDirections[] = { #define OBJ_EVENT_PAL_TAG_34 0x1123 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF -#include "data/event_object/event_object_graphics_info_pointers.h" -#include "data/event_object/field_effect_object_template_pointers.h" -#include "data/event_object/event_object_pic_tables.h" -#include "data/event_object/event_object_anims.h" -#include "data/event_object/base_oam.h" -#include "data/event_object/event_object_subsprites.h" -#include "data/event_object/event_object_graphics_info.h" +#include "data/object_event/event_object_graphics_info_pointers.h" +#include "data/object_event/field_effect_object_template_pointers.h" +#include "data/object_event/event_object_pic_tables.h" +#include "data/object_event/event_object_anims.h" +#include "data/object_event/base_oam.h" +#include "data/object_event/event_object_subsprites.h" +#include "data/object_event/event_object_graphics_info.h" const struct SpritePalette sObjectEventSpritePalettes[] = { {gObjectEventPalette0, OBJ_EVENT_PAL_TAG_0}, @@ -661,14 +661,14 @@ const u16 *const gObjectPaletteTagSets[] = { gObjectPaletteTags3, }; -#include "data/event_object/berry_tree_graphics_tables.h" -#include "data/event_object/field_effect_objects.h" +#include "data/object_event/berry_tree_graphics_tables.h" +#include "data/object_event/field_effect_objects.h" const s16 gMovementDelaysMedium[] = {32, 64, 96, 128}; const s16 gMovementDelaysLong[] = {32, 64, 128, 192}; const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; -#include "data/event_object/movement_type_func_tables.h" +#include "data/object_event/movement_type_func_tables.h" const u8 gFaceDirectionAnimNums[] = { [DIR_NONE] = 0, @@ -1089,7 +1089,7 @@ const u8 gUnknown_0850DC3F[][4] = { {3, 4, 2, 1} }; -#include "data/event_object/movement_action_func_tables.h" +#include "data/object_event/movement_action_func_tables.h" // Code diff --git a/src/field_effect.c b/src/field_effect.c index 335de89b5a..982f31f06b 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -246,12 +246,12 @@ const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp"); const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp"); const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal"); const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp"); -const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_04.gbapal"); +const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_04.gbapal"); const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp"); const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp"); const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp"); const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp"); -const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_05.gbapal"); +const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_05.gbapal"); // Graphics for the lights streaking past your Pokemon when it uses a field move. const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp"); diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index a1f8d14fa3..ab20713d27 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -70,7 +70,7 @@ static const u8 gSpriteImage_858DB78[] = INCBIN_U8("graphics/unknown/858E588/4.4 static const u8 gUnusedEmptySpace_858DBF8[32] = {0}; -static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_07.gbapal"); +static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_07.gbapal"); static const u8 gSpriteImage_858DC38[] = INCBIN_U8("graphics/unknown/858E5D8/0.4bpp"); static const u8 gSpriteImage_858DCB8[] = INCBIN_U8("graphics/unknown/858E5D8/1.4bpp"); static const u8 gSpriteImage_858DD38[] = INCBIN_U8("graphics/unknown/858E5D8/2.4bpp"); @@ -82,7 +82,7 @@ static const u8 gSpriteImage_858DFB8[] = INCBIN_U8("graphics/unknown/858E5B0/2.4 static const u8 gSpriteImage_858E038[] = INCBIN_U8("graphics/unknown/858E5B0/3.4bpp"); static const u8 gSpriteImage_858E0B8[] = INCBIN_U8("graphics/unknown/858E5B0/4.4bpp"); static const u8 gSpriteImage_858E138[] = INCBIN_U8("graphics/unknown/858E5B0/5.4bpp"); -static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_08.gbapal"); +static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_08.gbapal"); static const u8 gSpriteImage_858E1D8[] = INCBIN_U8("graphics/unknown/858E674/0.4bpp"); static const u8 gSpriteImage_858E2D8[] = INCBIN_U8("graphics/unknown/858E674/1.4bpp"); static const u8 gSpriteImage_858E3D8[] = INCBIN_U8("graphics/unknown/858E674/2.4bpp"); From 8910739d8c58aa7a8e545f8834cf8fb3d8a28d47 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 21 Nov 2019 01:40:38 -0500 Subject: [PATCH 06/13] Rename mapObect to objectEvent --- src/apprentice.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/apprentice.c b/src/apprentice.c index 7b68cd25b3..5a9df5dae8 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -2103,7 +2103,7 @@ static void sub_81A1438(void) static void sub_81A150C(void) { u8 i; - u8 mapObjectGfxId; + u8 objectEventGfxId; u8 class = gApprentices[gSaveBlock2Ptr->apprentices[0].id].facilityClass; // Search male classes. @@ -2111,8 +2111,8 @@ static void sub_81A150C(void) ; if (i != ARRAY_COUNT(gTowerMaleFacilityClasses)) { - mapObjectGfxId = gTowerMaleTrainerGfxIds[i]; - VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); + objectEventGfxId = gTowerMaleTrainerGfxIds[i]; + VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId); return; } @@ -2120,23 +2120,23 @@ static void sub_81A150C(void) ; if (i != ARRAY_COUNT(gTowerFemaleFacilityClasses)) { - mapObjectGfxId = gTowerFemaleTrainerGfxIds[i]; - VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); + objectEventGfxId = gTowerFemaleTrainerGfxIds[i]; + VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId); } } static void Script_SetPlayerApprenticeTrainerGfxId(void) { u8 i; - u8 mapObjectGfxId; + u8 objectEventGfxId; u8 class = gApprentices[PLAYER_APPRENTICE.id].facilityClass; for (i = 0; i < ARRAY_COUNT(gTowerMaleFacilityClasses) && gTowerMaleFacilityClasses[i] != class; i++) ; if (i != ARRAY_COUNT(gTowerMaleFacilityClasses)) { - mapObjectGfxId = gTowerMaleTrainerGfxIds[i]; - VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); + objectEventGfxId = gTowerMaleTrainerGfxIds[i]; + VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId); return; } @@ -2144,8 +2144,8 @@ static void Script_SetPlayerApprenticeTrainerGfxId(void) ; if (i != ARRAY_COUNT(gTowerFemaleFacilityClasses)) { - mapObjectGfxId = gTowerFemaleTrainerGfxIds[i]; - VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); + objectEventGfxId = gTowerFemaleTrainerGfxIds[i]; + VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId); } } From 5822dfca8da22eae9a9c7ee8ec6320a5df7a7c55 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 21 Nov 2019 10:47:24 -0500 Subject: [PATCH 07/13] Rename FIELD_OBJ_EVENT to OBJECT_EVENT_MOVEMENT --- include/event_object_movement.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 4d40b91cb9..dbfb6d74db 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -1,5 +1,5 @@ -#ifndef GUARD_FIELD_OBJ_EVENT_H -#define GUARD_FIELD_OBJ_EVENT_H +#ifndef GUARD_OBJECT_EVENT_MOVEMENT_H +#define GUARD_OBJECT_EVENT_MOVEMENT_H #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 @@ -423,4 +423,4 @@ void sub_8097BB4(u8 var1, u8 graphicsId); void sub_8097CC4(u8 var1, u8 var2); bool32 sub_8097D9C(u8 var); -#endif //GUARD_FIELD_OBJ_EVENT_H +#endif //GUARD_OBJECT_EVENT_MOVEMENT_H From 86c08330c4a3f068a9618d5c80e06b9b8b6480c9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 21 Nov 2019 14:03:11 -0500 Subject: [PATCH 08/13] Fix Event Object include guards --- include/constants/event_object_movement_constants.h | 6 +++--- include/constants/event_objects.h | 6 +++--- include/event_obj_lock.h | 6 +++--- include/event_object_movement.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement_constants.h index ed6f6c7fb0..6a4405b653 100755 --- a/include/constants/event_object_movement_constants.h +++ b/include/constants/event_object_movement_constants.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONSTANTS_EVENTOBJMV_H -#define GUARD_CONSTANTS_EVENTOBJMV_H +#ifndef GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H +#define GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H #define MOVEMENT_TYPE_NONE 0x0 #define MOVEMENT_TYPE_LOOK_AROUND 0x1 @@ -244,4 +244,4 @@ #define MOVEMENT_ACTION_STEP_END 0xFE -#endif // GUARD_CONSTANTS_EVENTOBJMV_H +#endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 87ceb97b7c..83d9f6e4e7 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONSTANTS_OBJECT_EVENTS_H -#define GUARD_CONSTANTS_OBJECT_EVENTS_H +#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H +#define GUARD_CONSTANTS_EVENT_OBJECTS_H #define OBJ_EVENT_GFX_BRENDAN_NORMAL 0 #define OBJ_EVENT_GFX_BRENDAN_MACH_BIKE 1 @@ -279,4 +279,4 @@ #define OBJ_EVENT_ID_PLAYER 0xFF #define OBJ_EVENT_ID_CAMERA 0x7F -#endif // GUARD_CONSTANTS_OBJECT_EVENTS_H +#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h index 8958720189..f9ca40199b 100644 --- a/include/event_obj_lock.h +++ b/include/event_obj_lock.h @@ -1,5 +1,5 @@ -#ifndef GUARD_OBJ_EVENT_LOCK_H -#define GUARD_OBJ_EVENT_LOCK_H +#ifndef GUARD_EVENT_OBJ_LOCK_H +#define GUARD_EVENT_OBJ_LOCK_H bool8 sub_80983C4(void); void ScriptFreezeObjectEvents(void); @@ -10,4 +10,4 @@ bool8 sub_8098734(void); void ScriptUnfreezeObjectEvents(void); void sub_8098524(void); -#endif // GUARD_OBJ_EVENT_LOCK_H +#endif // GUARD_EVENT_OBJ_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index dbfb6d74db..3c006767fe 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -1,5 +1,5 @@ -#ifndef GUARD_OBJECT_EVENT_MOVEMENT_H -#define GUARD_OBJECT_EVENT_MOVEMENT_H +#ifndef GUARD_EVENT_OBJECT_MOVEMENT_H +#define GUARD_EVENT_OBJECT_MOVEMENT_H #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 @@ -423,4 +423,4 @@ void sub_8097BB4(u8 var1, u8 graphicsId); void sub_8097CC4(u8 var1, u8 var2); bool32 sub_8097D9C(u8 var); -#endif //GUARD_OBJECT_EVENT_MOVEMENT_H +#endif //GUARD_EVENT_OBJECT_MOVEMENT_H From 4c52cf9ed15f01f949fbf2139444f674694e446d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 21 Nov 2019 14:03:35 -0500 Subject: [PATCH 09/13] Fix event constant file names --- data/event_scripts.s | 2 +- data/map_events.s | 4 ++-- include/constants/{bg_event_constants.h => event_bg.h} | 6 +++--- ..._object_movement_constants.h => event_object_movement.h} | 0 src/battle_pyramid.c | 2 +- src/berry.c | 2 +- src/event_object_movement.c | 2 +- src/field_control_avatar.c | 2 +- src/field_effect.c | 2 +- src/field_player_avatar.c | 2 +- src/field_screen_effect.c | 2 +- src/field_special_scene.c | 2 +- src/field_specials.c | 2 +- src/fldeff_rocksmash.c | 2 +- src/item_use.c | 2 +- src/rotating_tile_puzzle.c | 2 +- src/script_movement.c | 2 +- src/secret_base.c | 2 +- src/trainer_hill.c | 2 +- src/trainer_see.c | 2 +- src/union_room_player_avatar.c | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) rename include/constants/{bg_event_constants.h => event_bg.h} (72%) rename include/constants/{event_object_movement_constants.h => event_object_movement.h} (100%) diff --git a/data/event_scripts.s b/data/event_scripts.s index 14f0b2be7c..a98a53a1a6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -13,7 +13,7 @@ #include "constants/decorations.h" #include "constants/easy_chat.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" #include "constants/field_poison.h" #include "constants/field_specials.h" diff --git a/data/map_events.s b/data/map_events.s index ceaa72837a..0f977acfbd 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,5 +1,5 @@ -#include "constants/bg_event_constants.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_bg.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" diff --git a/include/constants/bg_event_constants.h b/include/constants/event_bg.h similarity index 72% rename from include/constants/bg_event_constants.h rename to include/constants/event_bg.h index a915bc5091..64f3331b86 100755 --- a/include/constants/bg_event_constants.h +++ b/include/constants/event_bg.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONSTANTS_BG_EVENT_H -#define GUARD_CONSTANTS_BG_EVENT_H +#ifndef GUARD_CONSTANTS_EVENT_BG_H +#define GUARD_CONSTANTS_EVENT_BG_H #define BG_EVENT_PLAYER_FACING_ANY 0 #define BG_EVENT_PLAYER_FACING_NORTH 1 @@ -10,4 +10,4 @@ #define BG_EVENT_HIDDEN_ITEM 7 #define BG_EVENT_SECRET_BASE 8 -#endif // GUARD_CONSTANTS_BG_EVENT_H +#endif // GUARD_CONSTANTS_EVENT_BG_H diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement.h similarity index 100% rename from include/constants/event_object_movement_constants.h rename to include/constants/event_object_movement.h diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 2e7c30a9ca..81eff39a9b 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -29,7 +29,7 @@ #include "constants/battle_frontier.h" #include "constants/battle_pyramid.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/items.h" #include "constants/layouts.h" #include "constants/maps.h" diff --git a/src/berry.c b/src/berry.c index 438d29af98..7a8ab37fa0 100644 --- a/src/berry.c +++ b/src/berry.c @@ -12,7 +12,7 @@ #include "string_util.h" #include "text.h" #include "constants/berry.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/items.h" static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 6155c430a2..515171b319 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -22,7 +22,7 @@ #include "trainer_see.h" #include "trainer_hill.h" #include "util.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/items.h" diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 6973eb4874..a708e0c95b 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -28,7 +28,7 @@ #include "trainer_see.h" #include "trainer_hill.h" #include "wild_encounter.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/event_objects.h" #include "constants/map_types.h" #include "constants/maps.h" diff --git a/src/field_effect.c b/src/field_effect.c index 982f31f06b..3cb34c05e7 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -27,7 +27,7 @@ #include "trig.h" #include "util.h" #include "constants/field_effects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/rgb.h" #include "constants/songs.h" diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 9e23f2a348..3b0d4542fc 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -23,7 +23,7 @@ #include "wild_encounter.h" #include "constants/abilities.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" #include "constants/flags.h" #include "constants/maps.h" diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 05922e98cd..3ec422c658 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -27,7 +27,7 @@ #include "start_menu.h" #include "task.h" #include "text.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/songs.h" #include "constants/rgb.h" #include "trainer_hill.h" diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 56ebea8ada..f5d3abce6f 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -14,7 +14,7 @@ #include "sprite.h" #include "task.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_specials.h" #include "constants/songs.h" #include "constants/vars.h" diff --git a/src/field_specials.c b/src/field_specials.c index 319004add4..035e133515 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -48,7 +48,7 @@ #include "constants/battle_frontier.h" #include "constants/decorations.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" #include "constants/field_specials.h" #include "constants/items.h" diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index e8f901679b..614fa6135a 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -13,7 +13,7 @@ #include "sound.h" #include "sprite.h" #include "task.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/map_types.h" diff --git a/src/item_use.c b/src/item_use.c index 8ed9850cd4..e7f0f4fb3f 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -34,7 +34,7 @@ #include "string_util.h" #include "task.h" #include "text.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/item_effects.h" diff --git a/src/rotating_tile_puzzle.c b/src/rotating_tile_puzzle.c index 72f1afa554..408aa7fef5 100644 --- a/src/rotating_tile_puzzle.c +++ b/src/rotating_tile_puzzle.c @@ -4,7 +4,7 @@ #include "malloc.h" #include "rotating_tile_puzzle.h" #include "script_movement.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/metatile_labels.h" diff --git a/src/script_movement.c b/src/script_movement.c index d7addb2b72..4eb3059807 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -4,7 +4,7 @@ #include "task.h" #include "util.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" // static functions static void ScriptMovement_StartMoveObjects(u8 priority); diff --git a/src/secret_base.c b/src/secret_base.c index 866727ab39..b8752b8a6d 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -33,7 +33,7 @@ #include "task.h" #include "tv.h" #include "window.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/decorations.h" #include "constants/event_objects.h" #include "constants/items.h" diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 8a2f9a8fda..7e3e1e13d4 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -23,7 +23,7 @@ #include "window.h" #include "util.h" #include "constants/battle_ai.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/items.h" #include "constants/layouts.h" diff --git a/src/trainer_see.c b/src/trainer_see.c index 16d41fced1..b155754f6d 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -15,7 +15,7 @@ #include "battle_pyramid.h" #include "constants/battle_setup.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" // this file's functions diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c index e1b633ebbc..7f8d6066f3 100644 --- a/src/union_room_player_avatar.c +++ b/src/union_room_player_avatar.c @@ -7,7 +7,7 @@ #include "task.h" #include "union_room.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/flags.h" EWRAM_DATA struct UnkStruct_8019BA8 * gUnknown_02022C64 = NULL; From 1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 6 Dec 2019 02:55:30 -0500 Subject: [PATCH 10/13] Rename event_obj_lock to event_object_lock --- include/{event_obj_lock.h => event_object_lock.h} | 6 +++--- ld_script.txt | 2 +- src/{event_obj_lock.c => event_object_lock.c} | 2 +- src/field_screen_effect.c | 3 +-- src/fldeff_cut.c | 2 +- src/item_use.c | 2 +- src/scrcmd.c | 2 +- src/start_menu.c | 2 +- src/union_room.c | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) rename include/{event_obj_lock.h => event_object_lock.h} (69%) rename src/{event_obj_lock.c => event_object_lock.c} (99%) diff --git a/include/event_obj_lock.h b/include/event_object_lock.h similarity index 69% rename from include/event_obj_lock.h rename to include/event_object_lock.h index f9ca40199b..a3b350019d 100644 --- a/include/event_obj_lock.h +++ b/include/event_object_lock.h @@ -1,5 +1,5 @@ -#ifndef GUARD_EVENT_OBJ_LOCK_H -#define GUARD_EVENT_OBJ_LOCK_H +#ifndef GUARD_EVENT_OBJECT_LOCK_H +#define GUARD_EVENT_OBJECT_LOCK_H bool8 sub_80983C4(void); void ScriptFreezeObjectEvents(void); @@ -10,4 +10,4 @@ bool8 sub_8098734(void); void ScriptUnfreezeObjectEvents(void); void sub_8098524(void); -#endif // GUARD_EVENT_OBJ_LOCK_H +#endif // GUARD_EVENT_OBJECT_LOCK_H diff --git a/ld_script.txt b/ld_script.txt index 2f61377734..d8c50c40ce 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -113,7 +113,7 @@ SECTIONS { src/field_player_avatar.o(.text); src/event_object_movement.o(.text); src/field_message_box.o(.text); - src/event_obj_lock.o(.text); + src/event_object_lock.o(.text); src/text_window.o(.text); src/script.o(.text); src/scrcmd.o(.text); diff --git a/src/event_obj_lock.c b/src/event_object_lock.c similarity index 99% rename from src/event_obj_lock.c rename to src/event_object_lock.c index ce808fc2aa..1f1be8d5ab 100644 --- a/src/event_obj_lock.c +++ b/src/event_object_lock.c @@ -1,8 +1,8 @@ #include "global.h" #include "event_data.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "field_player_avatar.h" -#include "event_obj_lock.h" #include "script_movement.h" #include "task.h" #include "trainer_see.h" diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 3ec422c658..4b2f95ef02 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -5,6 +5,7 @@ #include "field_camera.h" #include "field_door.h" #include "field_effect.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "field_player_avatar.h" #include "field_screen_effect.h" @@ -17,7 +18,6 @@ #include "main.h" #include "menu.h" #include "mirage_tower.h" -#include "event_obj_lock.h" #include "metatile_behavior.h" #include "palette.h" #include "overworld.h" @@ -31,7 +31,6 @@ #include "constants/songs.h" #include "constants/rgb.h" #include "trainer_hill.h" -#include "event_obj_lock.h" #include "fldeff.h" extern const u16 gOrbEffectBackgroundLayerFlags[]; diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 4ab2a43967..3f98578978 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -1,5 +1,5 @@ #include "global.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "faraway_island.h" #include "field_camera.h" diff --git a/src/item_use.c b/src/item_use.c index 2211e1c702..54169db1cf 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -9,6 +9,7 @@ #include "coins.h" #include "data.h" #include "event_data.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "fieldmap.h" #include "field_effect.h" @@ -41,7 +42,6 @@ #include "constants/items.h" #include "constants/songs.h" #include "constants/vars.h" -#include "event_obj_lock.h" extern u8 BerryTree_EventScript_ItemUsePlantBerry[]; extern u8 BerryTree_EventScript_ItemUseWailmerPail[]; diff --git a/src/scrcmd.c b/src/scrcmd.c index 07a68a5538..f215b8541f 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -13,6 +13,7 @@ #include "event_data.h" #include "field_door.h" #include "field_effect.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "field_message_box.h" #include "field_player_avatar.h" @@ -24,7 +25,6 @@ #include "item.h" #include "lilycove_lady.h" #include "main.h" -#include "event_obj_lock.h" #include "menu.h" #include "money.h" #include "mystery_event_script.h" diff --git a/src/start_menu.c b/src/start_menu.c index ae26f99b37..de6cec8987 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -5,7 +5,7 @@ #include "bg.h" #include "event_data.h" #include "event_object_movement.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "event_scripts.h" #include "fieldmap.h" #include "field_effect.h" diff --git a/src/union_room.c b/src/union_room.c index f71120e598..ada2f0b466 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -10,7 +10,7 @@ #include "dynamic_placeholder_text_util.h" #include "easy_chat.h" #include "event_data.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "field_control_avatar.h" #include "field_player_avatar.h" #include "field_screen_effect.h" From ef67f2d33b45348d76d722f250cdbcc8485be264 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 05:43:06 -0500 Subject: [PATCH 11/13] Merge master into ObjEvent rename and prune accidental inclusions --- asm/macros/battle_frontier/battle_tower.inc | 31 +- data/event_scripts.s | 4 +- .../border.bin | Bin .../map.bin | Bin .../border.bin | Bin .../map.bin | Bin data/layouts/layouts.json | 16 +- .../scripts.inc | 12 +- .../scripts.inc | 4 +- .../scripts.inc | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 6 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- .../scripts.inc | 10 +- .../scripts.inc | 12 +- .../scripts.inc | 4 +- .../scripts.inc | 412 ++- .../map.json | 99 - .../scripts.inc | 507 ---- .../scripts.inc | 43 +- .../scripts.inc | 172 -- .../scripts.inc | 60 +- .../BattleFrontier_BattleTowerLobby/map.json | 24 +- .../scripts.inc | 863 ++++--- .../map.json | 143 +- .../scripts.inc | 2251 ++++------------- .../map.json | 6 +- .../scripts.inc | 176 ++ .../map.json | 138 + .../scripts.inc | 1809 +++++++++++++ data/maps/map_groups.json | 4 +- data/specials.inc | 2 +- .../pics/effects/lavaridge_gym_warp.png | Bin 406 -> 0 bytes include/battle_pyramid_bag.h | 4 +- include/constants/apprentice.h | 2 + include/constants/battle_tower.h | 24 +- include/constants/flags.h | 14 +- include/constants/frontier_util.h | 2 +- include/constants/item_effects.h | 4 +- include/constants/layouts.h | 4 +- include/constants/map_groups.h | 178 +- include/event_scripts.h | 5 + include/field_player_avatar.h | 1 + include/field_specials.h | 2 +- include/fieldmap.h | 2 +- include/global.fieldmap.h | 10 + include/global.h | 2 +- include/item_menu.h | 10 +- include/item_use.h | 30 +- include/menu.h | 1 - include/pokemon.h | 2 +- include/strings.h | 662 ++--- src/battle_ai_switch_items.c | 6 +- src/battle_arena.c | 2 +- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_player.c | 2 +- src/battle_controllers.c | 4 +- src/battle_dome.c | 2 +- src/battle_factory.c | 2 +- src/battle_main.c | 12 +- src/battle_palace.c | 2 +- src/battle_pyramid_bag.c | 20 +- src/battle_tower.c | 772 ++---- src/berry_tag_screen.c | 2 +- src/bike.c | 2 +- src/data/battle_frontier/apprentice.h | 2 +- src/data/pokemon/item_effects.h | 2 +- src/decoration.c | 1 + src/field_door.c | 14 +- src/field_specials.c | 42 +- src/fieldmap.c | 2 +- src/fldeff_dig.c | 2 +- src/frontier_pass.c | 2 +- src/frontier_util.c | 10 +- src/item_menu.c | 48 +- src/item_use.c | 490 ++-- src/overworld.c | 6 +- src/party_menu.c | 4 +- src/pokeblock.c | 2 +- src/pokemon.c | 26 +- src/region_map.c | 2 +- src/secret_base.c | 1 + src/start_menu.c | 8 +- 85 files changed, 4548 insertions(+), 4729 deletions(-) rename data/layouts/{BattleFrontier_BattleTowerCorridor2 => BattleFrontier_BattleTowerMultiCorridor}/border.bin (100%) rename data/layouts/{BattleFrontier_BattleTowerCorridor2 => BattleFrontier_BattleTowerMultiCorridor}/map.bin (100%) rename data/layouts/{BattleFrontier_BattleTowerMultiBattleRoom => BattleFrontier_BattleTowerMultiPartnerRoom}/border.bin (100%) rename data/layouts/{BattleFrontier_BattleTowerMultiBattleRoom => BattleFrontier_BattleTowerMultiPartnerRoom}/map.bin (100%) delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc rename data/maps/{BattleFrontier_BattleTowerCorridor2 => BattleFrontier_BattleTowerMultiCorridor}/map.json (90%) create mode 100644 data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc create mode 100644 data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json create mode 100644 data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc delete mode 100644 graphics/event_objects/pics/effects/lavaridge_gym_warp.png diff --git a/asm/macros/battle_frontier/battle_tower.inc b/asm/macros/battle_frontier/battle_tower.inc index d5a02ea21f..71e795b1d1 100644 --- a/asm/macros/battle_frontier/battle_tower.inc +++ b/asm/macros/battle_frontier/battle_tower.inc @@ -53,7 +53,36 @@ special CallBattleTowerFunc .endm - @ TODO: Document and add macros for BATTLE_TOWER_FUNC_10 - BATTLE_TOWER_FUNC_14 + @ Load the parties, gfx, and other data (like Apprentice id) for the multi partner candidates + .macro tower_loadpartners + setvar VAR_0x8004, BATTLE_TOWER_FUNC_LOAD_PARTNERS + special CallBattleTowerFunc + .endm + + @ Print message from potential multi partner. msgId is any PARTNER_MSGID_* + .macro tower_dopartnermsg msgId:req + setvar VAR_0x8004, BATTLE_TOWER_FUNC_PARTNER_MSG + setvar VAR_0x8005, \msgId + special CallBattleTowerFunc + .endm + + @ Receives/loads the opponent data for a link multi challenge. Returns 6 when finished, and finishes immediately if not doing a link multi battle. + .macro tower_loadlinkopponents + setvar VAR_0x8004, BATTLE_TOWER_FUNC_LOAD_LINK_OPPONENTS + special CallBattleTowerFunc + .endm + + @ Unknown. Destroys some link task if using wireless link. Wait for link? + .macro tower_unklink + setvar VAR_0x8004, BATTLE_TOWER_FUNC_13 + special CallBattleTowerFunc + .endm + + @ Set VAR_OBJ_GFX_ID_E to the gfx id of the selected multi partner + .macro tower_setpartnergfx + setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_PARTNER_GFX + special CallBattleTowerFunc + .endm @ Set the data used for the post-challenge Battle Tower interview .macro tower_setinterviewdata diff --git a/data/event_scripts.s b/data/event_scripts.s index 2b9d15848f..43d76c27a2 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -473,9 +473,9 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/SafariZone_Northeast/scripts.inc" .include "data/maps/SafariZone_Southeast/scripts.inc" .include "data/maps/BattleFrontier_OutsideEast/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc" .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc" - .include "data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc" - .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc" .include "data/maps/BattleFrontier_BattleDomeLobby/scripts.inc" .include "data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc" .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc" diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin similarity index 100% rename from data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin rename to data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin similarity index 100% rename from data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin rename to data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin similarity index 100% rename from data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin rename to data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin similarity index 100% rename from data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin rename to data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 8523bb8727..ff434efcee 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3892,24 +3892,24 @@ "blockdata_filepath": "data/layouts/DesertUnderpass/map.bin" }, { - "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", - "name": "BattleFrontier_BattleTowerMultiBattleRoom_Layout", + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM", + "name": "BattleFrontier_BattleTowerMultiPartnerRoom_Layout", "width": 21, "height": 15, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattleFrontier", - "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin", - "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" + "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin" }, { - "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", - "name": "BattleFrontier_BattleTowerCorridor2_Layout", + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR", + "name": "BattleFrontier_BattleTowerMultiCorridor_Layout", "width": 17, "height": 5, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattleFrontier", - "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin", - "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" + "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin" }, { "id": "LAYOUT_ROUTE111_NO_MIRAGE_TOWER", diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 45ad722570..910cabac30 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -48,7 +48,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft setvar VAR_TEMP_2, 1 - frontier_set FRONTIER_DATA_6, 1 + frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E @@ -143,8 +143,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0 call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent compare VAR_RESULT, 6 call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent - call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT @@ -252,8 +252,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext:: @ 82578BC BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4 message BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon waitmessage - call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT @@ -380,7 +380,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle:: @ 8257B5E BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle:: @ 8257B6C closemessage setvar VAR_TEMP_2, 0 - frontier_set FRONTIER_DATA_6, 0 + frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE special HealPlayerParty setvar VAR_0x8004, SPECIAL_BATTLE_ARENA setvar VAR_0x8005, 0 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 472a4a2a2d..90c374c232 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -77,8 +77,8 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge:: @ 8255D59 arena_save 0 playse SE_SAVE waitse - call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge message BattleFrontier_BattleArenaLobby_Text_RecordLastMatch waitmessage diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index dcc4f52c06..5da7d23f32 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -465,7 +465,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7 BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 - frontier_set FRONTIER_DATA_6, 0 + frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE special HealPlayerParty setvar VAR_0x8004, SPECIAL_BATTLE_DOME setvar VAR_0x8005, 0 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 7b5fcd9b48..e506adeb2f 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -86,8 +86,8 @@ BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 dome_save 0 playse SE_SAVE waitse - call BattleFrontier_BattleDomeLobby_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 message BattleFrontier_BattleDomeLobby_Text_24AE17 waitmessage diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index ca44f7b783..765a07e927 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 compare VAR_0x8006, 1 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 - frontier_set FRONTIER_DATA_6, 1 + frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE setvar VAR_TEMP_0, 1 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 waitmovement 0 @@ -29,8 +29,8 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB waitmessage switch VAR_RESULT - call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1 switch VAR_RESULT diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 75956f30a1..f3befad15c 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -82,7 +82,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: @ 825AEA7 msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage - frontier_set FRONTIER_DATA_6, 0 + frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE special HealPlayerParty setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8005, 0 @@ -180,7 +180,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09 BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle:: @ 825B0E0 closemessage - frontier_set FRONTIER_DATA_6, 0 + frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE special HealPlayerParty setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8005, 0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 65cca87132..87c7dcbbb3 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -75,8 +75,8 @@ BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge:: @ 8258506 waitse BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B - call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle message BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch waitmessage diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index dd5440299d..862b04de58 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -100,8 +100,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent compare VAR_RESULT, 6 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent - call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT @@ -215,7 +215,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge:: @ 8259E69 special SavePlayerParty factory_setparties 0 - frontier_set FRONTIER_DATA_6, 1 + frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE special CalculatePlayerPartyCount goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent @@ -391,8 +391,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible:: @ 825A0B0 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B9 message BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead waitmessage - call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index c7d4893ffe..55a8dcbb7c 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -45,7 +45,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom:: @ 824F86B waitmovement 0 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown setvar VAR_TEMP_2, 1 - frontier_set FRONTIER_DATA_6, 1 + frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge:: @ 824F8B5 @@ -104,8 +104,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98 call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent compare VAR_RESULT, 6 call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent - call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT @@ -180,8 +180,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext:: @ 824FB61 BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79 message BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven waitmessage - call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT @@ -290,7 +290,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD8 BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle:: @ 824FDF7 closemessage setvar VAR_TEMP_2, 0 - frontier_set FRONTIER_DATA_6, 0 + frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE special HealPlayerParty setvar VAR_0x8004, SPECIAL_BATTLE_PALACE setvar VAR_0x8005, 0 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index d7acb52aac..4d5c1d3122 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -77,8 +77,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge:: @ 824D8A1 palace_save 0 playse SE_SAVE waitse - call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 - compare VAR_RESULT, 1 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge message BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch waitmessage diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 48e1496e13..0290092940 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -1,147 +1,145 @@ BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_OnWarp .byte 0 -BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B55 +BattleFrontier_BattleTowerBattleRoom_OnWarp: @ 8241B4B + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects .2byte 0 -BattleFrontier_BattleTowerBattleRoom_EventScript_241B55:: @ 8241B55 +BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects:: @ 8241B55 setvar VAR_TEMP_1, 1 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_242198 + applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible end -BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C +BattleFrontier_BattleTowerBattleRoom_OnFrame: @ 8241B62 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom .2byte 0 -BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C +BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: @ 8241B6C setvar VAR_TEMP_0, 1 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter waitmovement 0 frontier_get FRONTIER_DATA_BATTLE_NUM compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant waitmovement 0 setvar VAR_TEMP_2, 1 - frontier_set FRONTIER_DATA_6, 1 - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE + goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 +BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter:: @ 8241BC3 tower_setopponent addobject 1 - applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182 + applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter waitmovement 0 tower_getopponentintro 0 msgbox gStringVar4, MSGBOX_DEFAULT waitmessage - call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E + call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle switch VAR_RESULT - case B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F -BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03 -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03 + case B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent +BattleFrontier_BattleTower_EventScript_WarpToLobbyLost:: @ 8241C03 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST tower_set TOWER_DATA_LVL_MODE setvar VAR_0x8004, 3 special Script_TryGainNewFanFromCounter - goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8 + goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby -BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F +BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F call BattleFrontier_EventScript_IncrementWinStreak tower_setbattlewon switch VAR_RESULT - case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188 + case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon + applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit waitmovement 0 removeobject 1 frontier_getbrainstatus compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY - call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D + call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant waitmovement 0 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - -BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F +BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F frontier_getbrainstatus copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY - goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext frontier_get FRONTIER_DATA_BATTLE_NUM - call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 - call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A + call BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40 - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C - case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge + case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A:: @ 8241D0A +BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8241D0A multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleTowerBattleRoom_EventScript_241D40:: @ 8241D40 - message BattleFrontier_BattleTowerBattleRoom_Text_2423A3 +BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle:: @ 8241D40 + message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241D72 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72 +BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle:: @ 8241D72 call BattleFrontier_EventScript_SaveBattle - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, MSGBOX_YESNO +BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge:: @ 8241D7C + msgbox BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO switch VAR_RESULT - case NO, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - case YES, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case NO, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent + case YES, BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA - message BattleFrontier_BattleTowerBattleRoom_Text_24244C +BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: @ 8241DAA + message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_24220E - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent -BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC +BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: @ 8241DDC closemessage - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos waitmovement 0 - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 + goto BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter -BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6 +BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon:: @ 8241DF6 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON tower_set TOWER_DATA_LVL_MODE setvar VAR_0x8004, 3 special Script_TryGainNewFanFromCounter - goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8 + goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby -BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22 - message BattleFrontier_BattleTowerBattleRoom_Text_242426 +BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge:: @ 8241E22 + message BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait waitmessage tower_save CHALLENGE_STATUS_PAUSED playse SE_SAVE @@ -150,43 +148,43 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22 frontier_reset end -BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44 +BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent:: @ 8241E44 copyvar VAR_TEMP_F, VAR_RESULT switch VAR_TEMP_F - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E90 - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241E97 - case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E - case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5 - case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC - case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3 + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor3rdOpponent + case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor4thOpponent + case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor5thOpponent + case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent + case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent -BattleFrontier_BattleTowerBattleRoom_EventScript_241E90:: @ 8241E90 - message BattleFrontier_BattleTowerBattleRoom_Text_242277 +BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8241E90 + message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent waitmessage return -BattleFrontier_BattleTowerBattleRoom_EventScript_241E97:: @ 8241E97 - message BattleFrontier_BattleTowerBattleRoom_Text_2422A9 +BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8241E97 + message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent waitmessage return -BattleFrontier_BattleTowerBattleRoom_EventScript_241E9E:: @ 8241E9E - message BattleFrontier_BattleTowerBattleRoom_Text_2422DB +BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor4thOpponent:: @ 8241E9E + message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent waitmessage return -BattleFrontier_BattleTowerBattleRoom_EventScript_241EA5:: @ 8241EA5 - message BattleFrontier_BattleTowerBattleRoom_Text_24230D +BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8241EA5 + message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent waitmessage return -BattleFrontier_BattleTowerBattleRoom_EventScript_241EAC:: @ 8241EAC - message BattleFrontier_BattleTowerBattleRoom_Text_24233F +BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent:: @ 8241EAC + message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent waitmessage return -BattleFrontier_BattleTowerBattleRoom_EventScript_241EB3:: @ 8241EB3 - message BattleFrontier_BattleTowerBattleRoom_Text_242371 +BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8241EB3 + message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent waitmessage return @@ -194,8 +192,8 @@ BattleFrontier_EventScript_IncrementWinStreak:: @ 8241EBA frontier_incrementstreak return -BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A +BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter:: @ 8241EC3 + applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter waitmovement 0 applymovement 3, Common_Movement_WalkInPlaceLeft waitmovement 0 @@ -204,113 +202,111 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB + applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant waitmovement 0 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A1 + applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit waitmovement 0 return -BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A +BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext:: @ 8241F0A compare VAR_TEMP_2, 1 - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, MSGBOX_DEFAULT + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden + msgbox BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 - -BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 - message BattleFrontier_BattleTowerBattleRoom_Text_242542 +BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden:: @ 8241F22 + message BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden waitmessage - call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40 - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C - case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge + case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden -BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79 +BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: @ 8241F79 multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 + case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel + case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge + case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden -BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF +BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: @ 8241FAF call BattleFrontier_EventScript_SetBrainObjectGfx closemessage - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 + applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos waitmovement 0 addobject 1 - applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_2421B2 + applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter waitmovement 0 switch VAR_TEMP_F - case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleTowerBattleRoom_EventScript_242085 - case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 - case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH compare VAR_RESULT, FALSE - goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_242029 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver + msgbox BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel, MSGBOX_DEFAULT frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH -BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, MSGBOX_DEFAULT - call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 +BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver:: @ 8242029 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent, MSGBOX_DEFAULT + call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver + goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost -BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 +BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 8242046 call BattleFrontier_EventScript_IncrementWinStreak frontier_getsymbols compare VAR_RESULT, 0 - goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, MSGBOX_DEFAULT + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon + msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleTowerBattleRoom_Text_24270E + message BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol waitmessage waitfanfare frontier_givesymbol - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon -BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 +BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro:: @ 8242085 frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH compare VAR_RESULT, FALSE - goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold + msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack, MSGBOX_DEFAULT frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH -BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, MSGBOX_DEFAULT - call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 +BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold:: @ 82420B2 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe, MSGBOX_DEFAULT + call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold + goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost -BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF +BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF call BattleFrontier_EventScript_IncrementWinStreak frontier_getsymbols compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, MSGBOX_DEFAULT + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon + msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattleTowerBattleRoom_Text_242932 + message BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine waitmessage waitfanfare frontier_givesymbol - msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon -BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E -BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E +BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle:: @ 824210E closemessage setvar VAR_TEMP_2, 0 - frontier_set FRONTIER_DATA_6, 0 + frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE special HealPlayerParty setvar VAR_0x8004, SPECIAL_BATTLE_TOWER setvar VAR_0x8005, 0 @@ -318,11 +314,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E waitstate copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE compare VAR_0x8004, FRONTIER_MODE_LINK_MULTIS - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle frontier_restorehelditems special HealPlayerParty frontier_resetsketch -BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A +BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle:: @ 824215A tower_setinterviewdata frontier_get FRONTIER_DATA_BATTLE_OUTCOME return @@ -331,22 +327,22 @@ BattleFrontier_EventScript_SetBrainObjectGfx:: @ 8242170 frontier_setbrainobj return -BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179 +BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter: @ 8242179 walk_up walk_up walk_up face_right step_end -BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E +BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant: @ 824217E face_down step_end -BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180 +BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle: @ 8242180 face_right step_end -BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182 +BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter: @ 8242182 walk_down walk_down walk_down @@ -354,21 +350,21 @@ BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182 face_left step_end -BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188 +BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit: @ 8242188 walk_up walk_up walk_up walk_up step_end -BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D +BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer: @ 824218D walk_right walk_right walk_right walk_up step_end -BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192 +BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos: @ 8242192 walk_down walk_left walk_left @@ -376,11 +372,11 @@ BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192 face_right step_end -BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198 +BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible: @ 8242198 set_invisible step_end -BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A +BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter: @ 824219A set_visible delay_16 walk_up @@ -389,21 +385,21 @@ BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A delay_8 step_end -BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1 +BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit: @ 82421A1 walk_right walk_right walk_down set_invisible step_end -BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6 +BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay: @ 82421A6 delay_16 delay_16 delay_16 delay_16 step_end -BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB +BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant: @ 82421AB face_right delay_16 delay_16 @@ -412,7 +408,7 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB walk_in_place_right step_end -BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 +BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter: @ 82421B2 walk_slow_down walk_slow_down walk_slow_down @@ -420,113 +416,107 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 face_left step_end -BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 -BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 +BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby:: @ 82421B8 copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, FRONTIER_MODE_DOUBLES - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles compare VAR_RESULT, FRONTIER_MODE_MULTIS - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis compare VAR_RESULT, FRONTIER_MODE_LINK_MULTIS - goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate end -BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8:: @ 82421E8 +BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles:: @ 82421E8 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 waitstate end -BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2 +BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis:: @ 82421F2 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6 waitstate end -BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC - setvar VAR_0x8004, BATTLE_TOWER_FUNC_13 - special CallBattleTowerFunc +BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis:: @ 82421FC + tower_unklink warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 waitstate end -BattleFrontier_BattleTowerBattleRoom_EventScript_24220E:: @ 824220E +BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge:: @ 824220E setflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE - goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 + goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost end -BattleFrontier_BattleTowerBattleRoom2_Text_242217: @ 8242217 -BattleFrontier_BattleTowerBattleRoom_Text_242217: @ 8242217 +BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth: @ 8242217 .string "We will restore your POKéMON to\n" .string "full health.$" -BattleFrontier_BattleTowerBattleRoom_Text_242244: @ 8242244 +@ Unused +BattleFrontier_BattleTowerBattleRoom_Text_ReadyForOpponent: @ 8242244 .string "You will be facing opponent no. {STR_VAR_1}.\n" .string "Are you ready?$" -BattleFrontier_BattleTowerBattleRoom_Text_242277: @ 8242277 +BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent: @ 8242277 .string "You will be facing opponent no. 2.\n" .string "Are you ready?$" -BattleFrontier_BattleTowerBattleRoom_Text_2422A9: @ 82422A9 +BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent: @ 82422A9 .string "You will be facing opponent no. 3.\n" .string "Are you ready?$" -BattleFrontier_BattleTowerBattleRoom_Text_2422DB: @ 82422DB +BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent: @ 82422DB .string "You will be facing opponent no. 4.\n" .string "Are you ready?$" -BattleFrontier_BattleTowerBattleRoom_Text_24230D: @ 824230D +BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent: @ 824230D .string "You will be facing opponent no. 5.\n" .string "Are you ready?$" -BattleFrontier_BattleTowerBattleRoom_Text_24233F: @ 824233F +BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent: @ 824233F .string "You will be facing opponent no. 6.\n" .string "Are you ready?$" -BattleFrontier_BattleTowerBattleRoom_Text_242371: @ 8242371 +BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent: @ 8242371 .string "You will be facing opponent no. 7.\n" .string "Are you ready?$" -BattleFrontier_BattleTowerBattleRoom2_Text_2423A3: @ 82423A3 -BattleFrontier_BattleTowerBattleRoom_Text_2423A3: @ 82423A3 +BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle: @ 82423A3 .string "Record your battle on your\n" .string "FRONTIER PASS?$" -BattleFrontier_BattleTowerLobby_Text_2423CD: @ 82423CD +BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass: @ 82423CD .string "{PLAYER}'s battle was recorded\n" .string "on the FRONTIER PASS.$" -BattleFrontier_BattleTowerBattleRoom2_Text_2423FC: @ 82423FC -BattleFrontier_BattleTowerBattleRoom_Text_2423FC: @ 82423FC +BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame: @ 82423FC .string "Would you like to save and\n" .string "quit the game?$" -BattleFrontier_BattleTowerBattleRoom2_Text_242426: @ 8242426 -BattleFrontier_BattleTowerBattleRoom_Text_242426: @ 8242426 +BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait: @ 8242426 .string "Saving your battle data.\n" .string "Please wait.$" -BattleFrontier_BattleTowerBattleRoom2_Text_24244C: @ 824244C -BattleFrontier_BattleTowerBattleRoom_Text_24244C: @ 824244C +BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge: @ 824244C .string "Would you like to cancel your BATTLE\n" .string "ROOM challenge?$" -gText_BattleRecordCouldntBeSaved:: @ 8242481 +BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved:: @ 8242481 .string "There was an error of some sort.\n" .string "Your record could not be saved.$" -BattleFrontier_BattleTowerBattleRoom_Text_2424C2: @ 82424C2 +BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay: @ 82424C2 .string "Excuse me, but…\p" .string "Our leader, the SALON MAIDEN, is on\n" .string "her way here in hopes of battling you.\p" .string "She should be arriving very shortly.$" -BattleFrontier_BattleTowerBattleRoom_Text_242542: @ 8242542 +BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden: @ 8242542 .string "You will be facing the SALON MAIDEN.\n" .string "Are you prepared?$" -BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579 +BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel: @ 8242579 .string "Greetings…\n" .string "My name is ANABEL.\p" .string "I am the SALON MAIDEN, and I am in\n" @@ -538,20 +528,20 @@ BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579 .string "The reason I've come to see you…\n" .string "Well, there is but one reason…$" -BattleFrontier_BattleTowerBattleRoom_Text_24268C: @ 824268C +BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent: @ 824268C .string "Let me see your talent in\n" .string "its entirety…$" -BattleFrontier_BattleTowerBattleRoom_Text_2426B4: @ 82426B4 +BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized: @ 82426B4 .string "ANABEL: Fufufu, nicely done…\p" .string "Your FRONTIER PASS, please…\n" .string "Your talent shall be recognized.$" -BattleFrontier_BattleTowerBattleRoom_Text_24270E: @ 824270E +BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol: @ 824270E .string "The Ability Symbol was embossed on\n" .string "the FRONTIER PASS!$" -BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744 +BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime: @ 8242744 .string "… … … … … …\p" .string "You have confidence in your POKéMON\n" .string "battling talent, don't you?\p" @@ -560,7 +550,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744 .string "I will be waiting for you.\n" .string "Until the next time we meet…$" -BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9 +BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack: @ 82427F9 .string "ANABEL: You really did come back to\n" .string "see me…\p" .string "… … … … … …\p" @@ -570,18 +560,18 @@ BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9 .string "Too long since I've been able to battle\n" .string "without thinking about anything…$" -BattleFrontier_BattleTowerBattleRoom_Text_2428E0: @ 82428E0 +BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe: @ 82428E0 .string "Let's begin, shall we?$" -BattleFrontier_BattleTowerBattleRoom_Text_2428F7: @ 82428F7 +BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease: @ 82428F7 .string "ANABEL: Fufu, congratulations…\n" .string "Your FRONTIER PASS, please…$" -BattleFrontier_BattleTowerBattleRoom_Text_242932: @ 8242932 +BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine: @ 8242932 .string "The Ability Symbol took on\n" .string "a golden shine!$" -BattleFrontier_BattleTowerBattleRoom_Text_24295D: @ 824295D +BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain: @ 824295D .string "That was fun…\p" .string "I have never had a POKéMON battle\n" .string "so enjoyable before…\p" diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json deleted file mode 100644 index 905102cd33..0000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2", - "name": "BattleFrontier_BattleTowerBattleRoom2", - "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", - "music": "MUS_SATTOWER", - "region_map_section": "MAPSEC_BATTLE_FRONTIER", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, - "allow_running": false, - "show_map_name": false, - "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJ_EVENT_GFX_VAR_0", - "x": 5, - "y": 1, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "0x0", - "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" - }, - { - "graphics_id": "OBJ_EVENT_GFX_TEALA", - "x": 1, - "y": 4, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "0x0", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_TEALA", - "x": 1, - "y": 5, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "0x0", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_VAR_1", - "x": 4, - "y": 1, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "0x0", - "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" - }, - { - "graphics_id": "OBJ_EVENT_GFX_VAR_F", - "x": 4, - "y": 8, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "0x0", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_VAR_E", - "x": 5, - "y": 8, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "0x0", - "flag": "0" - } - ], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc deleted file mode 100644 index df01459903..0000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ /dev/null @@ -1,507 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43 - .byte 0 - -BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS - call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F - setvar VAR_0x8004, BATTLE_TOWER_FUNC_14 - special CallBattleTowerFunc - checkplayergender - compare VAR_RESULT, FEMALE - goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 - setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29 - setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F - special SetBattleTowerLinkPlayerGfx - return - -BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D - .2byte 0 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D - hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 - end - -BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D - .2byte 0 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D - setvar VAR_TEMP_0, 1 - applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518 - applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E - waitmovement 0 - frontier_get FRONTIER_DATA_BATTLE_NUM - compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 - applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E - applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E - waitmovement 0 - applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 - applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 - waitmovement 0 - frontier_set FRONTIER_DATA_6, 1 - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 - tower_setopponent - addobject 1 - addobject 4 - applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528 - applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E - waitmovement 0 - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 - tower_getopponentintro 0 - delay 15 - applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 - waitmovement 0 - msgbox gStringVar4, MSGBOX_DEFAULT - waitmessage - tower_getopponentintro 1 - applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 - waitmovement 0 - msgbox gStringVar4, MSGBOX_DEFAULT - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026 - tower_getopponentintro 0 - delay 15 - applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 - waitmovement 0 - messageautoscroll gStringVar4 - waitmessage - delay 48 - tower_getopponentintro 1 - applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 - waitmovement 0 - messageautoscroll gStringVar4 - waitmessage - delay 48 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069 - call BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA - -BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E - frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST - tower_set TOWER_DATA_LVL_MODE - setvar VAR_0x8004, 3 - special Script_TryGainNewFanFromCounter - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA - call BattleFrontier_EventScript_IncrementWinStreak - tower_setbattlewon - switch VAR_RESULT - case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF - applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534 - applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249539 - waitmovement 0 - removeobject 1 - removeobject 4 - applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E - applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E - waitmovement 0 - applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 - applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 - waitmovement 0 - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 - msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118 - messageautoscroll BattleFrontier_BattleTowerBattleRoom2_Text_242217 - waitmessage - delay 48 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 - special LoadPlayerParty - frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 - frontier_get FRONTIER_DATA_BATTLE_NUM - call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 - call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 - multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7 - case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223 - case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1 - multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223 - case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7 - message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3 - waitmessage - multichoicedefault 20, 8, MULTI_YESNO, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219 - call BattleFrontier_EventScript_SaveBattle - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223 - msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO - switch VAR_RESULT - case NO, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - case YES, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251 - message BattleFrontier_BattleTowerBattleRoom2_Text_24244C - waitmessage - multichoicedefault 20, 8, MULTI_YESNO, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283 - closemessage - clearflag FLAG_TEMP_2 - applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526 - applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526 - waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_249541 - applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_249541 - waitmovement 0 - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF - frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON - tower_set TOWER_DATA_LVL_MODE - setvar VAR_0x8004, 3 - special Script_TryGainNewFanFromCounter - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB - message BattleFrontier_BattleTowerBattleRoom2_Text_242426 - waitmessage - tower_save CHALLENGE_STATUS_PAUSED - playse SE_SAVE - waitse - fadescreen FADE_TO_BLACK - frontier_reset - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E - copyvar VAR_TEMP_F, VAR_RESULT - switch VAR_TEMP_F - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354 - case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B - case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362 - case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_249369 - case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_249370 - case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249377 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249354:: @ 8249354 - message BattleFrontier_BattleTowerBattleRoom2_Text_249547 - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B:: @ 824935B - message BattleFrontier_BattleTowerBattleRoom2_Text_249578 - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249362:: @ 8249362 - message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9 - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249369:: @ 8249369 - message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249370:: @ 8249370 - message BattleFrontier_BattleTowerBattleRoom2_Text_24960B - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377 - message BattleFrontier_BattleTowerBattleRoom2_Text_24963C - waitmessage - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E - copyvar VAR_TEMP_F, VAR_RESULT - switch VAR_TEMP_F - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA - case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6 - case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2 - case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE - case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA - case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249406 - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA:: @ 82493CA - message BattleFrontier_BattleTowerBattleRoom2_Text_249547 - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6:: @ 82493D6 - message BattleFrontier_BattleTowerBattleRoom2_Text_249578 - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2:: @ 82493E2 - message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9 - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE:: @ 82493EE - message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA:: @ 82493FA - message BattleFrontier_BattleTowerBattleRoom2_Text_24960B - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249406:: @ 8249406 - message BattleFrontier_BattleTowerBattleRoom2_Text_24963C - waitmessage - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412 - waitmessage - delay 48 - return - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417 - goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 - multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8 - case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457 - multichoice 20, 8, MULTI_GO_ON_RETIRE, 1 - switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - message gText_LinkStandby3 - waitmessage - special sub_813B568 - waitstate - compare VAR_RESULT, 0 - goto_if_ne BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8 - message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3 - waitmessage - multichoicedefault 20, 8, MULTI_YESNO, 1, 0 - switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - call BattleFrontier_EventScript_SaveBattle - setflag FLAG_TEMP_2 - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD - message BattleFrontier_BattleTowerBattleRoom2_Text_24244C - waitmessage - multichoicedefault 20, 8, MULTI_YESNO, 1, 0 - compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA:: @ 82494FA - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - message gText_LinkStandby3 - waitmessage - special sub_813B568 - waitstate - goto BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E - end - -BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514 - special sub_813B534 - return - -BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518 - walk_up - walk_up - walk_up - walk_up - face_right - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E - walk_left - walk_up - walk_up - walk_up - face_right - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524 - face_left - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526 - walk_in_place_fastest_right - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528 - walk_down - walk_down - walk_down - walk_down - face_left - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E - walk_right - walk_down - walk_down - walk_down - face_left - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534 - walk_up - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539 - walk_up - walk_up - walk_up - walk_up - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E - walk_right - walk_right - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541 - walk_left - walk_left - walk_in_place_fastest_right - step_end - -BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545 - walk_in_place_left - step_end - -BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547 - .string "The 2nd set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_249578: @ 8249578 - .string "The 3rd set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_2495A9: @ 82495A9 - .string "The 4th set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_2495DA: @ 82495DA - .string "The 5th set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24960B: @ 824960B - .string "The 6th set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24963C: @ 824963C - .string "The 7th set of opponents is next.\n" - .string "Are you ready?$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24966D: @ 824966D - .string "The 2nd set of opponents is next.\n" - .string "Do your best!$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24969D: @ 824969D - .string "The 3rd set of opponents is next.\n" - .string "Do your best!$" - -BattleFrontier_BattleTowerBattleRoom2_Text_2496CD: @ 82496CD - .string "The 4th set of opponents is next.\n" - .string "Do your best!$" - -BattleFrontier_BattleTowerBattleRoom2_Text_2496FD: @ 82496FD - .string "The 5th set of opponents is next.\n" - .string "Do your best!$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24972D: @ 824972D - .string "The 6th set of opponents is next.\n" - .string "Do your best!$" - -BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D - .string "The 7th set of opponents is next.\n" - .string "Do your best!$" - -gText_LinkStandby3:: @ 824978D - .string "Link standby…$" - -gText_YourPartnerHasRetired:: @ 824979B - .string "Your partner has retired.\p" - .string "Your BATTLE ROOM challenge\n" - .string "will be canceled.$" diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc index 3da4302a26..1acea47858 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -1,55 +1,52 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA - map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 + map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_OnFrame .byte 0 -BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 +BattleFrontier_BattleTowerCorridor_OnLoad: @ 8241AB5 compare VAR_0x8006, 1 - goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3 + goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0 setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0 end -BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3 +BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor:: @ 8241AD3 setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0 setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0 end -BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_241AF0 +BattleFrontier_BattleTowerCorridor_OnFrame: @ 8241AE6 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor .2byte 0 -BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 +BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: @ 8241AF0 setvar VAR_TEMP_0, 1 compare VAR_0x8006, 1 - goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 - applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39 + goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor + applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor waitmovement 0 - goto BattleFrontier_BattleTowerCorridor_EventScript_241B27 + goto BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom -BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 - applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36 +BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor:: @ 8241B16 + applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor waitmovement 0 -BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 +BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom:: @ 8241B27 setvar VAR_TEMP_0, 0 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end -BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36 +BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor: @ 8241B36 walk_right - -BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37 +BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor: @ 8241B37 walk_right walk_right - -BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39 +BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor: @ 8241B39 walk_right - -BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A +BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor: @ 8241B3A walk_right walk_right walk_right diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc deleted file mode 100644 index 4ae755b373..0000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ /dev/null @@ -1,172 +0,0 @@ -BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2 - .byte 0 - -BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS - call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D71 - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D91 - end - -BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 - setvar VAR_0x8004, BATTLE_TOWER_FUNC_14 - special CallBattleTowerFunc - checkplayergender - compare VAR_RESULT, FEMALE - goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B - setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL - return - -BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B - setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL - return - -BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91 - special SetBattleTowerLinkPlayerGfx - return - -BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248D9F - .2byte 0 - -BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F - hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 - hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 - hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 - special OffsetCameraForBattle - end - -BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerCorridor2_EventScript_248DBC - .2byte 0 - -BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC - lockall - setflag FLAG_SPECIAL_FLAG_0x4002 - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 1 - opendoor 1, 1 - waitdooranim - clearflag FLAG_SPECIAL_FLAG_0x4002 - showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 - showobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 - applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EE6 - applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EE6 - waitmovement 0 - setflag FLAG_SPECIAL_FLAG_0x4002 - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 1 - closedoor 1, 1 - waitdooranim - clearflag FLAG_SPECIAL_FLAG_0x4002 - applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EBC - applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EC4 - applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248ECC - applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 - waitmovement 0 - delay 40 - applymovement 3, Common_Movement_WalkInPlaceFastestUp - applymovement 2, Common_Movement_WalkInPlaceFastestUp - waitmovement 0 - opendoor 7, 1 - waitdooranim - applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_248EE3 - applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248EE3 - applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EDE - applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EDE - waitmovement 0 - closedoor 7, 1 - waitdooranim - delay 30 - setvar VAR_TEMP_1, 1 - call BattleFrontier_BattleTowerCorridor2_EventScript_248E71 - releaseall - end - -BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES - call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES - call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS - call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 - compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 - return - -BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 - waitstate - return - -BattleFrontier_BattleTowerCorridor2_EventScript_248EA8:: @ 8248EA8 - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 - waitstate - return - -BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2 - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 - waitstate - return - -BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC - walk_down - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - step_end - -BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4 - walk_down - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - step_end - -BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC - walk_right - walk_right - walk_right - walk_right - walk_right - walk_right - walk_up - walk_in_place_fastest_right - step_end - -BattleFrontier_BattleTowerCorridor2_Movement_248ED5: @ 8248ED5 - walk_left - walk_left - walk_left - walk_left - walk_left - walk_left - walk_up - walk_in_place_fastest_left - step_end - -BattleFrontier_BattleTowerCorridor2_Movement_248EDE: @ 8248EDE - delay_16 - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3 - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6 - walk_down - step_end - diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index e66004ba9b..e74d08a173 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -1,89 +1,89 @@ BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_241A96 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_OnWarp .byte 0 -BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_2419F0 +BattleFrontier_BattleTowerElevator_OnFrame: @ 82419E6 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_EnterElevator .2byte 0 -BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 +BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0 setvar VAR_TEMP_0, 1 - applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A + applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter waitmovement 0 special BufferBattleTowerElevatorFloors waitse special MoveElevator waitstate delay 48 - applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92 + applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantExit + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerExit waitmovement 0 - call BattleFrontier_BattleTowerElevator_EventScript_241A28 + call BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom end -BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 +BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom:: @ 8241A28 compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES - call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55 + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES - call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55 + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS - call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A5F + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A72 + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti return -BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 +BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor:: @ 8241A55 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate return -BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F - goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_241A7C - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 +BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti:: @ 8241A5F + goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2 waitstate return -BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72 - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 +BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti:: @ 8241A72 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2 waitstate return -BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1 +BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom:: @ 8241A7C + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 1 waitstate return -BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86 +BattleFrontier_BattleTowerElevator_Movement_AttendantEnter: @ 8241A86 walk_up walk_right face_down step_end -BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A +BattleFrontier_BattleTowerElevator_Movement_PlayerEnter: @ 8241A8A walk_up walk_up face_down step_end -BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E +BattleFrontier_BattleTowerElevator_Movement_AttendantExit: @ 8241A8E walk_down walk_down set_invisible step_end -BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92 +BattleFrontier_BattleTowerElevator_Movement_PlayerExit: @ 8241A92 walk_right walk_down walk_down step_end -BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_241AA0 +BattleFrontier_BattleTowerElevator_OnWarp: @ 8241A96 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth .2byte 0 -BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0 +BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth:: @ 8241AA0 setvar VAR_TEMP_1, 1 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index 9160d37e71..2be4721b77 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23E936", + "script": "BattleFrontier_BattleTowerLobby_EventScript_SinglesAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23EEE7", + "script": "BattleFrontier_BattleTowerLobby_EventScript_FeelingsMan", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFB5", + "script": "BattleFrontier_BattleTowerLobby_EventScript_Woman", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFBE", + "script": "BattleFrontier_BattleTowerLobby_EventScript_Boy", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23EA9F", + "script": "BattleFrontier_BattleTowerLobby_EventScript_DoublesAttendant", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23EC08", + "script": "BattleFrontier_BattleTowerLobby_EventScript_MultisAttendant", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23ED74", + "script": "BattleFrontier_BattleTowerLobby_EventScript_LinkMultisAttendant", "flag": "0" } ], @@ -163,7 +163,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFC7" + "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowSinglesResults" }, { "type": "sign", @@ -171,7 +171,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFE0" + "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowDoublesResults" }, { "type": "sign", @@ -179,7 +179,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFF9" + "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowMultisResults" }, { "type": "sign", @@ -187,7 +187,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23F012" + "script": "BattleFrontier_BattleTowerLobby_EventScript_ShowLinkMultisResults" }, { "type": "sign", @@ -195,7 +195,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE" + "script": "BattleFrontier_BattleTowerLobby_EventScript_RulesBoard" } ] } diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index ef9c60a669..132c1615af 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -35,21 +35,21 @@ BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth:: @ 823E6D3 end BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E707 - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleTowerLobby_EventScript_23E710 - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleTowerLobby_EventScript_23E8EE - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleTowerLobby_EventScript_23E758 - map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleTowerLobby_EventScript_23E7F2 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_GetChallengeStatus + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleTowerLobby_EventScript_QuitWithoutSaving + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleTowerLobby_EventScript_ResumeChallenge + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattleTowerLobby_EventScript_WonChallenge + map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleTowerLobby_EventScript_LostChallenge .2byte 0 -BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707 +BattleFrontier_BattleTowerLobby_EventScript_GetChallengeStatus:: @ 823E707 frontier_getstatus end -BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 +BattleFrontier_BattleTowerLobby_EventScript_QuitWithoutSaving:: @ 823E710 lock faceplayer - msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT closemessage tower_set TOWER_DATA_WIN_STREAK, 0 tower_set TOWER_DATA_WIN_STREAK_ACTIVE, FALSE @@ -58,69 +58,66 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 release end -BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 +BattleFrontier_BattleTowerLobby_EventScript_WonChallenge:: @ 823E758 lock faceplayer frontier_isbrain compare VAR_RESULT, TRUE - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 - message BattleFrontier_BattleTowerLobby_Text_23F60D + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_DefeatedMaiden + message BattleFrontier_BattleTowerLobby_Text_CongratsBeatenSeven waitmessage - goto BattleFrontier_BattleTowerLobby_EventScript_23E780 + goto BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons -BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778 - msgbox BattleFrontier_BattleTowerLobby_Text_241486, MSGBOX_DEFAULT - -BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 +BattleFrontier_BattleTowerLobby_EventScript_DefeatedMaiden:: @ 823E778 + msgbox BattleFrontier_BattleTowerLobby_Text_CongratsDefeatedMaiden, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons:: @ 823E780 tower_giveribbons compare VAR_RESULT, FALSE - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 - message BattleFrontier_BattleTowerLobby_Text_23F844 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints + message BattleFrontier_BattleTowerLobby_Text_HereAreSomeRibbons waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, MSGBOX_DEFAULT -BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 - msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerLobby_Text_PutRibbonOnMons, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints:: @ 823E7A5 + msgbox BattleFrontier_BattleTowerLobby_Text_AwardYouTheseBattlePoints, MSGBOX_DEFAULT frontier_givepoints msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS - call BattleFrontier_BattleTowerLobby_EventScript_23E84D + call BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle tower_get TOWER_DATA_WIN_STREAK compare VAR_RESULT, 49 - goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E7E2 - msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT - -BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge + msgbox BattleFrontier_BattleTowerLobby_Text_AboutToFace50thTrainer, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge:: @ 823E7E2 + msgbox BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 release end -BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2 +BattleFrontier_BattleTowerLobby_EventScript_LostChallenge:: @ 823E7F2 compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS - goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E - goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak + goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak tower_get TOWER_DATA_WIN_STREAK compare VAR_RESULT, 0 - goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830 - -BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying +BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak:: @ 823E81E tower_set TOWER_DATA_WIN_STREAK_ACTIVE, FALSE -BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830 +BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying:: @ 823E830 lock faceplayer - message BattleFrontier_BattleTowerLobby_Text_23F6F7 + message BattleFrontier_BattleTowerLobby_Text_ThankYouForPlaying waitmessage - call BattleFrontier_BattleTowerLobby_EventScript_23E84D - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT + call BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle + msgbox BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 release end -BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D - message BattleFrontier_BattleTowerLobby_Text_23F70F +BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle:: @ 823E84D + message BattleFrontier_BattleTowerLobby_Text_RecordWillBeSaved waitmessage frontier_checkairshow special LoadPlayerParty @@ -128,94 +125,83 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D tower_save 0 playse SE_SAVE waitse - call BattleFrontier_BattleTowerLobby_EventScript_23E8E0 - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF - message BattleFrontier_BattleTowerLobby_Text_23FE3C + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle + message BattleFrontier_BattleTowerLobby_Text_RecordLastMatch waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT - case 1, BattleFrontier_BattleTowerLobby_EventScript_23E8DF + case 1, BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle case 0, BattleFrontier_EventScript_SaveBattle - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23E8DF + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle BattleFrontier_EventScript_SaveBattle:: @ 823E8B4 frontier_savebattle compare VAR_RESULT, FALSE goto_if_eq BattleFrontier_EventScript_BattleSaveFailed playse SE_SAVE - msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF + msgbox BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle BattleFrontier_EventScript_BattleSaveFailed:: @ 823E8D7 - msgbox gText_BattleRecordCouldntBeSaved, MSGBOX_DEFAULT -BattleFrontier_BattleTowerLobby_EventScript_23E8DF:: @ 823E8DF + msgbox BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle:: @ 823E8DF return -BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleArenaLobby_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleDomeLobby_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleFactoryLobby_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattlePalaceLobby_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0 -BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 - frontier_get FRONTIER_DATA_6 +BattleFrontier_EventScript_GetCantRecordBattle:: @ 823E8E0 + frontier_get FRONTIER_DATA_RECORD_DISABLED return -BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE +BattleFrontier_BattleTowerLobby_EventScript_ResumeChallenge:: @ 823E8EE lock faceplayer compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E930 - message BattleFrontier_BattleTowerLobby_Text_23F737 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_SetBravoTrainerOn + message BattleFrontier_BattleTowerLobby_Text_WeveBeenWaitingForYou waitmessage - message BattleFrontier_BattleTowerLobby_Text_23F754 + message BattleFrontier_BattleTowerLobby_Text_ProgressWillBeSaved waitmessage tower_save CHALLENGE_STATUS_SAVING playse SE_SAVE waitse frontier_set FRONTIER_DATA_PAUSED, FALSE - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator end -BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930 - setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 +BattleFrontier_BattleTowerLobby_EventScript_SetBravoTrainerOn:: @ 823E930 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, TRUE return -BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 +BattleFrontier_BattleTowerLobby_EventScript_SinglesAttendant:: @ 823E936 lock faceplayer setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240537, MSGBOX_DEFAULT - -BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948 - message BattleFrontier_BattleTowerLobby_Text_2405B3 + msgbox BattleFrontier_BattleTowerLobby_Text_WelcomSingleBattle, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_AskEnterSinglesChallenge:: @ 823E948 + message BattleFrontier_BattleTowerLobby_Text_TakeSinglesChallenge waitmessage multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23E984 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA91 - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 0, BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge + case 1, BattleFrontier_BattleTowerLobby_EventScript_ExplainSinglesChallenge + case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge -BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 +BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge:: @ 823E984 setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES - message BattleFrontier_BattleTowerLobby_Text_23FD3B + message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode waitmessage multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge frontier_checkineligible compare VAR_0x8004, TRUE - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT - msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerLobby_Text_SelectThreeMons, MSGBOX_DEFAULT fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT @@ -223,14 +209,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge + msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO switch VAR_RESULT - case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case YES, BattleFrontier_BattleTowerLobby_EventScript_23EA2A - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge + case YES, BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeSinglesChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge -BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A +BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeSinglesChallenge:: @ 823EA2A frontier_set FRONTIER_DATA_SELECTED_MON_ORDER setvar VAR_TEMP_0, 0 tower_init @@ -242,47 +228,46 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER - setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, TRUE + goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator end -BattleFrontier_BattleTowerLobby_EventScript_23EA91:: @ 823EA91 - msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23E948 +BattleFrontier_BattleTowerLobby_EventScript_ExplainSinglesChallenge:: @ 823EA91 + msgbox BattleFrontier_BattleTowerLobby_Text_ExplainSinglesChallenge, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_AskEnterSinglesChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F +BattleFrontier_BattleTowerLobby_EventScript_DoublesAttendant:: @ 823EA9F lock faceplayer setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, MSGBOX_DEFAULT - -BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1 - message BattleFrontier_BattleTowerLobby_Text_24085E + msgbox BattleFrontier_BattleTowerLobby_Text_WelcomeDoubleBattle, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_AskEnterDoublesChallenge:: @ 823EAB1 + message BattleFrontier_BattleTowerLobby_Text_TakeDoublesChallenge waitmessage multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23EAED - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EBFA - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 0, BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge + case 1, BattleFrontier_BattleTowerLobby_EventScript_ExplainDoublesChallenge + case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge -BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED +BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge:: @ 823EAED setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES - message BattleFrontier_BattleTowerLobby_Text_23FD3B + message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode waitmessage multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge frontier_checkineligible compare VAR_0x8004, TRUE - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT - msgbox BattleFrontier_BattleTowerLobby_Text_240A50, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectFourMons, MSGBOX_DEFAULT fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT @@ -290,14 +275,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge + msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO switch VAR_RESULT - case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case YES, BattleFrontier_BattleTowerLobby_EventScript_23EB93 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge + case YES, BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeDoublesChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge -BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 +BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeDoublesChallenge:: @ 823EB93 frontier_set FRONTIER_DATA_SELECTED_MON_ORDER setvar VAR_TEMP_0, 0 tower_init @@ -309,48 +294,47 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER - setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, FALSE + goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator end -BattleFrontier_BattleTowerLobby_EventScript_23EBFA:: @ 823EBFA - msgbox BattleFrontier_BattleTowerLobby_Text_240897, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23EAB1 +BattleFrontier_BattleTowerLobby_EventScript_ExplainDoublesChallenge:: @ 823EBFA + msgbox BattleFrontier_BattleTowerLobby_Text_ExplainDoublesChallenge, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_AskEnterDoublesChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08 +BattleFrontier_BattleTowerLobby_EventScript_MultisAttendant:: @ 823EC08 lock faceplayer setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER clearflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, MSGBOX_DEFAULT - -BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D - message BattleFrontier_BattleTowerLobby_Text_240B06 + msgbox BattleFrontier_BattleTowerLobby_Text_WelcomeMultiBattle, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_AskEnterMultisChallenge:: @ 823EC1D + message BattleFrontier_BattleTowerLobby_Text_TakeMultisChallenge waitmessage multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23EC59 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23ED66 - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 0, BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge + case 1, BattleFrontier_BattleTowerLobby_EventScript_ExplainMultisChallenge + case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge -BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 +BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge:: @ 823EC59 setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS - message BattleFrontier_BattleTowerLobby_Text_23FD3B + message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode waitmessage multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge frontier_checkineligible compare VAR_0x8004, TRUE - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT - msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons, MSGBOX_DEFAULT fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT @@ -358,14 +342,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge + msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO switch VAR_RESULT - case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case YES, BattleFrontier_BattleTowerLobby_EventScript_23ECFF - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge + case YES, BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeMultisChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge -BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF +BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeMultisChallenge:: @ 823ECFF frontier_set FRONTIER_DATA_SELECTED_MON_ORDER setvar VAR_TEMP_0, 0 tower_init @@ -377,47 +361,46 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER - setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, FALSE + goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator end -BattleFrontier_BattleTowerLobby_EventScript_23ED66:: @ 823ED66 - msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23EC1D +BattleFrontier_BattleTowerLobby_EventScript_ExplainMultisChallenge:: @ 823ED66 + msgbox BattleFrontier_BattleTowerLobby_Text_ExplainMultisChallenge, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_AskEnterMultisChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74 +BattleFrontier_BattleTowerLobby_EventScript_LinkMultisAttendant:: @ 823ED74 lock faceplayer setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240E15, MSGBOX_DEFAULT - -BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86 - message BattleFrontier_BattleTowerLobby_Text_240E95 + msgbox BattleFrontier_BattleTowerLobby_Text_WelcomeLinkMultiBattle, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_AskEnterLinkMultisChallenge:: @ 823ED86 + message BattleFrontier_BattleTowerLobby_Text_TakeLinkMultisChallenge waitmessage multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23EDC2 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23F3DA - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 0, BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge + case 1, BattleFrontier_BattleTowerLobby_EventScript_ExplainLinkMultisChallenge + case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge -BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 +BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge:: @ 823EDC2 setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - message BattleFrontier_BattleTowerLobby_Text_23FD3B + message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode waitmessage multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT - case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge frontier_checkineligible compare VAR_0x8004, TRUE - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT - msgbox BattleFrontier_BattleTowerLobby_Text_24115E, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons2, MSGBOX_DEFAULT fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT @@ -425,14 +408,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge + msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO switch VAR_RESULT - case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case YES, BattleFrontier_BattleTowerLobby_EventScript_23EE68 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge + case YES, BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge -BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 +BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge:: @ 823EE68 frontier_set FRONTIER_DATA_SELECTED_MON_ORDER setvar VAR_TEMP_0, 0 tower_init @@ -445,87 +428,87 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 - goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5 + compare VAR_RESULT, TRUE + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink + goto BattleFrontier_BattleTowerLobby_EventScript_TryCableLink end -BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7 +BattleFrontier_BattleTowerLobby_EventScript_FeelingsMan:: @ 823EEE7 lock faceplayer - message BattleFrontier_BattleTowerLobby_Text_23F8CD + message BattleFrontier_BattleTowerLobby_Text_DescribeFeelingsAboutBattleTower waitmessage multichoice 16, 4, MULTI_BATTLE_TOWER_FEELINGS, 0 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23EF32 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EF4C - case 2, BattleFrontier_BattleTowerLobby_EventScript_23EF66 - case 3, BattleFrontier_BattleTowerLobby_EventScript_23EF80 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23EF80 + case 0, BattleFrontier_BattleTowerLobby_EventScript_FeelingsBattleNow + case 1, BattleFrontier_BattleTowerLobby_EventScript_FeelingsIWon + case 2, BattleFrontier_BattleTowerLobby_EventScript_FeelingsILost + case 3, BattleFrontier_BattleTowerLobby_EventScript_FeelingsWontTell + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_FeelingsWontTell release end -BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 - msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_FeelingsBattleNow:: @ 823EF32 + msgbox BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouBegin, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_START call Common_ShowEasyChatScreen lock faceplayer - goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A + goto BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings end -BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C - msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_FeelingsIWon:: @ 823EF4C + msgbox BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouveWon, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_WON call Common_ShowEasyChatScreen lock faceplayer - goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A + goto BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings end -BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 - msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_FeelingsILost:: @ 823EF66 + msgbox BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouveLost, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_LOST call Common_ShowEasyChatScreen lock faceplayer - goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A + goto BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings end -BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80 - msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_FeelingsWontTell:: @ 823EF80 + msgbox BattleFrontier_BattleTowerLobby_Text_DontThinkMuchAboutIt, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A +BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings:: @ 823EF8A compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CanceledEasyChat compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_SubmittedFeelings end -BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1 - msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_CanceledEasyChat:: @ 823EFA1 + msgbox BattleFrontier_BattleTowerLobby_Text_ChangedYourMind, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_23EFAB:: @ 823EFAB - msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_SubmittedFeelings:: @ 823EFAB + msgbox BattleFrontier_BattleTowerLobby_Text_ThatsHowYouFeel, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_23EFB5:: @ 823EFB5 - msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, MSGBOX_NPC +BattleFrontier_BattleTowerLobby_EventScript_Woman:: @ 823EFB5 + msgbox BattleFrontier_BattleTowerLobby_Text_WinsInRowRecorded, MSGBOX_NPC end -BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE - msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, MSGBOX_NPC +BattleFrontier_BattleTowerLobby_EventScript_Boy:: @ 823EFBE + msgbox BattleFrontier_BattleTowerLobby_Text_CanLeaveUntilLossOrSevenWins, MSGBOX_NPC end -BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 +BattleFrontier_BattleTowerLobby_EventScript_ShowSinglesResults:: @ 823EFC7 lockall frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_SINGLES waitbuttonpress @@ -533,7 +516,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 releaseall end -BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0 +BattleFrontier_BattleTowerLobby_EventScript_ShowDoublesResults:: @ 823EFE0 lockall frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_DOUBLES waitbuttonpress @@ -541,7 +524,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0 releaseall end -BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9 +BattleFrontier_BattleTowerLobby_EventScript_ShowMultisResults:: @ 823EFF9 lockall frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_MULTIS waitbuttonpress @@ -549,7 +532,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9 releaseall end -BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012 +BattleFrontier_BattleTowerLobby_EventScript_ShowLinkMultisResults:: @ 823F012 lockall frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_LINK_MULTIS waitbuttonpress @@ -557,127 +540,125 @@ BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012 releaseall end -BattleFrontier_BattleTowerLobby_EventScript_23F02B:: @ 823F02B +BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons:: @ 823F02B switch VAR_RESULT - case FRONTIER_LVL_50, BattleFrontier_BattleTowerLobby_EventScript_23F046 - case FRONTIER_LVL_OPEN, BattleFrontier_BattleTowerLobby_EventScript_23F08B + case FRONTIER_LVL_50, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50 + case FRONTIER_LVL_OPEN, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpen -BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046 +BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50:: @ 823F046 switch VAR_FRONTIER_BATTLE_MODE - case FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_23F06F - case FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_23F07D - msgbox BattleFrontier_BattleTowerLobby_Text_24038B, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 + case FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Singles + case FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Doubles + msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Multis, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23F06F:: @ 823F06F - msgbox BattleFrontier_BattleTowerLobby_Text_240027, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 +BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Singles:: @ 823F06F + msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Singles, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D - msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 +BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Doubles:: @ 823F07D + msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Doubles, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B +BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 823F08B switch VAR_FRONTIER_BATTLE_MODE - case FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_23F0B4 - case FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_23F0C2 - msgbox BattleFrontier_BattleTowerLobby_Text_24046B, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 + case FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenSingles + case FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenDoubles + msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenMultis, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23F0B4:: @ 823F0B4 - msgbox BattleFrontier_BattleTowerLobby_Text_24010B, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 +BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenSingles:: @ 823F0B4 + msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenSingles, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2 - msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 +BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenDoubles:: @ 823F0C2 + msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenDoubles, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0 +BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed:: @ 823F0D0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS @ No status provided, so it relies on VAR_0x8006 being 0 already - goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + goto BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3 +BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge:: @ 823F0E3 special LoadPlayerParty -BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6 +BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge:: @ 823F0E6 special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT -BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1 + msgbox BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge:: @ 823F0F1 release end -BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3 +BattleFrontier_BattleTowerLobby_EventScript_EnterElevator:: @ 823F0F3 special SavePlayerParty setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_PARTY_ORDER call BattleFrontier_BattleTowerLobby_EventScript_GetPartySize special CallFrontierUtilFunc setvar VAR_RESULT, 0 - -BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 - setvar VAR_0x8004, BATTLE_TOWER_FUNC_12 - special CallBattleTowerFunc +BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad:: @ 823F108 + tower_loadlinkopponents delay 1 compare VAR_RESULT, 6 - goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23F108 - call BattleFrontier_BattleTowerLobby_EventScript_23F135 + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad + call BattleFrontier_BattleTowerLobby_EventScript_ShowYouToBattleRoom clearflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar VAR_TEMP_0, 0 waitstate end -BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 - call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 +BattleFrontier_BattleTowerLobby_EventScript_ShowYouToBattleRoom:: @ 823F135 + call BattleFrontier_BattleTowerLobby_EventScript_BufferModeText compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 - msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F15B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ShowYouToLinkMultiBattleRoom + msgbox BattleFrontier_BattleTowerLobby_Text_ShowYouToBattleRoom, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_WalkToElevator -BattleFrontier_BattleTowerLobby_EventScript_23F152:: @ 823F152 - messageautoscroll BattleFrontier_BattleTowerLobby_Text_23FE11 +BattleFrontier_BattleTowerLobby_EventScript_ShowYouToLinkMultiBattleRoom:: @ 823F152 + messageautoscroll BattleFrontier_BattleTowerLobby_Text_ShowYouToBattleRoom waitmessage delay 48 - -BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B +BattleFrontier_BattleTowerLobby_EventScript_WalkToElevator:: @ 823F15B closemessage - call BattleFrontier_BattleTowerLobby_EventScript_23F1E8 - call BattleFrontier_BattleTowerLobby_EventScript_23F22D - applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F195 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F195 + call BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo + call BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord + applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_WalkToElevator + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_WalkToElevator waitmovement 0 opendoor VAR_0x8004, 1 waitdooranim - applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F199 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F19C + applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_AttendantEnterElevator + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_PlayerEnterElevator waitmovement 0 closedoor VAR_0x8004, 1 waitdooranim return -BattleFrontier_BattleTowerLobby_Movement_23F195: @ 823F195 +BattleFrontier_BattleTowerLobby_Movement_WalkToElevator: @ 823F195 walk_up walk_up walk_up step_end -BattleFrontier_BattleTowerLobby_Movement_23F199: @ 823F199 +BattleFrontier_BattleTowerLobby_Movement_AttendantEnterElevator: @ 823F199 walk_up set_invisible step_end -BattleFrontier_BattleTowerLobby_Movement_23F19C: @ 823F19C +BattleFrontier_BattleTowerLobby_Movement_PlayerEnterElevator: @ 823F19C walk_up walk_up set_invisible step_end -BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 +@ Unused +BattleFrontier_BattleTowerLobby_Movement_UnusedEnterElevator: @ 823F1A0 walk_fast_up walk_fast_up walk_fast_up @@ -686,84 +667,84 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 set_invisible step_end -BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 +BattleFrontier_BattleTowerLobby_EventScript_BufferModeText:: @ 823F1A7 compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D4 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_BufferTextSingle compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D9 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_BufferTextDouble compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1DE + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_BufferTextMulti compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1E3 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_BufferTextLinkMulti return -BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4 +BattleFrontier_BattleTowerLobby_EventScript_BufferTextSingle:: @ 823F1D4 bufferstdstring 0, STDSTRING_SINGLE return -BattleFrontier_BattleTowerLobby_EventScript_23F1D9:: @ 823F1D9 +BattleFrontier_BattleTowerLobby_EventScript_BufferTextDouble:: @ 823F1D9 bufferstdstring 0, STDSTRING_DOUBLE return -BattleFrontier_BattleTowerLobby_EventScript_23F1DE:: @ 823F1DE +BattleFrontier_BattleTowerLobby_EventScript_BufferTextMulti:: @ 823F1DE bufferstdstring 0, STDSTRING_MULTI return -BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3 +BattleFrontier_BattleTowerLobby_EventScript_BufferTextLinkMulti:: @ 823F1E3 bufferstdstring 0, STDSTRING_MULTI_LINK return -BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 +BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo:: @ 823F1E8 compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F215 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_TalkedToSinglesAttendant compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F21B + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_TalkedToDoublesAttendant compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F221 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_TalkedToMultisAttendant compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F227 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_TalkedToLinkMultisAttendant return -BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215 +BattleFrontier_BattleTowerLobby_EventScript_TalkedToSinglesAttendant:: @ 823F215 setvar VAR_LAST_TALKED, 1 return -BattleFrontier_BattleTowerLobby_EventScript_23F21B:: @ 823F21B +BattleFrontier_BattleTowerLobby_EventScript_TalkedToDoublesAttendant:: @ 823F21B setvar VAR_LAST_TALKED, 7 return -BattleFrontier_BattleTowerLobby_EventScript_23F221:: @ 823F221 +BattleFrontier_BattleTowerLobby_EventScript_TalkedToMultisAttendant:: @ 823F221 setvar VAR_LAST_TALKED, 8 return -BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227 +BattleFrontier_BattleTowerLobby_EventScript_TalkedToLinkMultisAttendant:: @ 823F227 setvar VAR_LAST_TALKED, 9 return -BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D +BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord:: @ 823F22D compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F25A + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordSingles compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F260 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordDoubles compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F266 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordMultis compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F26C + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordLinkMultis return -BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A +BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordSingles:: @ 823F25A setvar VAR_0x8004, 6 return -BattleFrontier_BattleTowerLobby_EventScript_23F260:: @ 823F260 +BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordDoubles:: @ 823F260 setvar VAR_0x8004, 10 return -BattleFrontier_BattleTowerLobby_EventScript_23F266:: @ 823F266 +BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordMultis:: @ 823F266 setvar VAR_0x8004, 14 return -BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C +BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordLinkMultis:: @ 823F26C setvar VAR_0x8004, 18 return @@ -798,7 +779,7 @@ BattleFrontier_EventScript_GetLvlMode:: @ 823F2B7 frontier_get FRONTIER_DATA_LVL_MODE return -BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 +BattleFrontier_BattleTowerLobby_EventScript_TryCableLink:: @ 823F2C5 setvar VAR_0x8004, USING_BATTLE_TOWER message gText_PleaseWaitForLink waitmessage @@ -806,70 +787,70 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 special TryBattleLinkup waitstate compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful compare VAR_RESULT, 2 goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F351 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLinkIncorrectNumberOfPlayers compare VAR_RESULT, 5 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge compare VAR_RESULT, 6 goto_if_eq CableClub_EventScript_AbortLinkConnectionError compare VAR_RESULT, 11 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLink end -BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 +BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections:: @ 823F327 special CloseLink compare VAR_0x8005, 3 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_FriendDifferentSelection msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F - msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, MSGBOX_DEFAULT - msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_FriendDifferentSelection:: @ 823F33F + msgbox BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlMode, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerLobby_Text_ChooseDifferentMonsMatchLvlMode, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 - msgbox BattleFrontier_BattleTowerLobby_Text_241240, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_AbortLinkIncorrectNumberOfPlayers:: @ 823F351 + msgbox BattleFrontier_BattleTowerLobby_Text_LinkMultiOnlyForTwoPlayers, MSGBOX_DEFAULT special CloseLink msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 +BattleFrontier_BattleTowerLobby_EventScript_AbortLink:: @ 823F366 special CloseLink compare VAR_0x8005, 0 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F394 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_FriendChoseDifferentLvlMode compare VAR_0x8005, 1 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F39D + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMon compare VAR_0x8005, 2 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3A6 - msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMons + msgbox BattleFrontier_BattleTowerLobby_Text_ChooseDifferentMonsMatchLvlMode, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_23F394:: @ 823F394 - msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_FriendChoseDifferentLvlMode:: @ 823F394 + msgbox BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlMode, MSGBOX_DEFAULT return -BattleFrontier_BattleTowerLobby_EventScript_23F39D:: @ 823F39D - msgbox BattleFrontier_BattleTowerLobby_Text_241285, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMon:: @ 823F39D + msgbox BattleFrontier_BattleTowerLobby_Text_FriendAlsoSelectedMon, MSGBOX_DEFAULT return -BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6 - msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, MSGBOX_DEFAULT +BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMons:: @ 823F3A6 + msgbox BattleFrontier_BattleTowerLobby_Text_FriendAlsoSelectedMons, MSGBOX_DEFAULT return -BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF +BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful:: @ 823F3AF incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER - setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 - message BattleFrontier_BattleTowerLobby_Text_24144D + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, FALSE + message BattleFrontier_BattleTowerLobby_Text_SaveGameBeforeShowingIn waitmessage tower_save CHALLENGE_STATUS_SAVING special sub_80A08CC @@ -877,128 +858,130 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF playse SE_SAVE waitse special sub_80B3BC4 - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator end -BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA - msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23ED86 +BattleFrontier_BattleTowerLobby_EventScript_ExplainLinkMultisChallenge:: @ 823F3DA + msgbox BattleFrontier_BattleTowerLobby_Text_ExplainLinkMultisChallenge, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_AskEnterLinkMultisChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8 +BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink:: @ 823F3E8 setvar VAR_0x8004, LINK_GROUP_BATTLE_TOWER - goto BattleFrontier_BattleTowerLobby_EventScript_23F3F3 + goto BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader end -BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 +BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader:: @ 823F3F3 message CableClub_Text_ChooseGroupLeaderOfTwo waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F463 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23F430 - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case 0, BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup + case 1, BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader + case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge end -BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 +BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader:: @ 823F430 call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful compare VAR_RESULT, 5 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader compare VAR_RESULT, 8 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F430 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader compare VAR_RESULT, 11 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLink release return -BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 +BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup:: @ 823F463 call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful compare VAR_RESULT, 5 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader compare VAR_RESULT, 8 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F463 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup compare VAR_RESULT, 11 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLink release return -BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496 +BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful:: @ 823F496 incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER - setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 - message BattleFrontier_BattleTowerLobby_Text_24144D + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, FALSE + message BattleFrontier_BattleTowerLobby_Text_SaveGameBeforeShowingIn waitmessage tower_save CHALLENGE_STATUS_SAVING special sub_80A08CC waitstate playse SE_SAVE waitse - goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 + goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator end -BattleFrontier_BattleTowerLobby_EventScript_23F4BE:: @ 823F4BE +BattleFrontier_BattleTowerLobby_EventScript_RulesBoard:: @ 823F4BE lockall - msgbox BattleFrontier_BattleTowerLobby_Text_241540, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD + msgbox BattleFrontier_BattleTowerLobby_Text_RulesAreListed, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattleTowerLobby_EventScript_23F4CD:: @ 823F4CD - message BattleFrontier_BattleTowerLobby_Text_241563 +BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard:: @ 823F4CD + message BattleFrontier_BattleTowerLobby_Text_ReadWhichHeading waitmessage multichoice 17, 2, MULTI_BATTLE_TOWER_RULES, 0 switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F520 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23F52E - case 2, BattleFrontier_BattleTowerLobby_EventScript_23F53C - case 3, BattleFrontier_BattleTowerLobby_EventScript_23F54A - case 4, BattleFrontier_BattleTowerLobby_EventScript_23F558 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F558 + case 0, BattleFrontier_BattleTowerLobby_EventScript_RulesTower + case 1, BattleFrontier_BattleTowerLobby_EventScript_RulesMons + case 2, BattleFrontier_BattleTowerLobby_EventScript_RulesSalon + case 3, BattleFrontier_BattleTowerLobby_EventScript_RulesMultiLink + case 4, BattleFrontier_BattleTowerLobby_EventScript_ExitRules + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_ExitRules end -BattleFrontier_BattleTowerLobby_EventScript_23F520:: @ 823F520 - msgbox BattleFrontier_BattleTowerLobby_Text_241586, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD +BattleFrontier_BattleTowerLobby_EventScript_RulesTower:: @ 823F520 + msgbox BattleFrontier_BattleTowerLobby_Text_ExplainTowerRules, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattleTowerLobby_EventScript_23F52E:: @ 823F52E - msgbox BattleFrontier_BattleTowerLobby_Text_241693, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD +BattleFrontier_BattleTowerLobby_EventScript_RulesMons:: @ 823F52E + msgbox BattleFrontier_BattleTowerLobby_Text_ExplainMonRules, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattleTowerLobby_EventScript_23F53C:: @ 823F53C - msgbox BattleFrontier_BattleTowerLobby_Text_241777, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD +BattleFrontier_BattleTowerLobby_EventScript_RulesSalon:: @ 823F53C + msgbox BattleFrontier_BattleTowerLobby_Text_ExplainSalonRules, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattleTowerLobby_EventScript_23F54A:: @ 823F54A - msgbox BattleFrontier_BattleTowerLobby_Text_24187E, MSGBOX_DEFAULT - goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD +BattleFrontier_BattleTowerLobby_EventScript_RulesMultiLink:: @ 823F54A + msgbox BattleFrontier_BattleTowerLobby_Text_ExplainMultiLinkRules, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard end -BattleFrontier_BattleTowerLobby_EventScript_23F558:: @ 823F558 +BattleFrontier_BattleTowerLobby_EventScript_ExitRules:: @ 823F558 releaseall end -BattleFrontier_BattleTowerLobby_EventScript_23F55A: @ 823F55A +@ Unused +BattleFrontier_BattleTowerLobby_EventScript_DirectYouToBattleRoom: @ 823F55A .string "I'll direct you to your BATTLE ROOM now.$" -BattleFrontier_BattleTowerLobby_Text_23F583: @ 823F583 +BattleFrontier_BattleTowerLobby_Text_DidntSaveBeforeQuitting: @ 823F583 .string "Excuse me!\p" .string "You didn't save before you quit your\n" .string "challenge last time.\p" .string "Because of that, your challenge so far\n" .string "has been disqualified. Sorry!$" -BattleFrontier_BattleTowerLobby_Text_23F60D: @ 823F60D +BattleFrontier_BattleTowerLobby_Text_CongratsBeatenSeven: @ 823F60D .string "Congratulations!\n" .string "You've beaten all seven TRAINERS!\p" .string "$" -BattleFrontier_BattleTowerLobby_Text_23F641: @ 823F641 +@ Unused +BattleFrontier_BattleTowerLobby_Text_EarnedFabulousPrize: @ 823F641 .string "For beating seven TRAINERS in a row,\n" .string "you have earned this fabulous prize!\p" .string "$" @@ -1013,23 +996,23 @@ BattleFrontier_BattleTowerLobby_Text_BagFullMakeRoom: @ 823F6A6 .string "Please make room in your BAG, then come\n" .string "see me.$" -BattleFrontier_BattleTowerLobby_Text_23F6F7: @ 823F6F7 +BattleFrontier_BattleTowerLobby_Text_ThankYouForPlaying: @ 823F6F7 .string "Thank you for playing!\p" .string "$" -BattleFrontier_BattleTowerLobby_Text_23F70F: @ 823F70F +BattleFrontier_BattleTowerLobby_Text_RecordWillBeSaved: @ 823F70F .string "Your record will be saved.\n" .string "Please wait.$" -BattleFrontier_BattleTowerLobby_Text_23F737: @ 823F737 +BattleFrontier_BattleTowerLobby_Text_WeveBeenWaitingForYou: @ 823F737 .string "We've been waiting for you!\p" .string "$" -BattleFrontier_BattleTowerLobby_Text_23F754: @ 823F754 +BattleFrontier_BattleTowerLobby_Text_ProgressWillBeSaved: @ 823F754 .string "Before entering a BATTLE ROOM, your\n" .string "progress will be saved. Please wait.$" -BattleFrontier_BattleTowerLobby_Text_23F79D: @ 823F79D +BattleFrontier_BattleTowerLobby_Text_AboutToFace50thTrainer: @ 823F79D .string "You're finally about to face the\n" .string "50th TRAINER.\p" .string "From here on, every time you beat seven\n" @@ -1037,61 +1020,62 @@ BattleFrontier_BattleTowerLobby_Text_23F79D: @ 823F79D .string "receive a commemorative RIBBON.\p" .string "Good luck!$" -BattleFrontier_BattleTowerLobby_Text_23F844: @ 823F844 +BattleFrontier_BattleTowerLobby_Text_HereAreSomeRibbons: @ 823F844 .string "Here are some RIBBONS for beating\n" .string "seven tough TRAINERS in a row.\p" .string "{PLAYER} received some RIBBONS!$" -BattleFrontier_BattleTowerLobby_Text_23F89F: @ 823F89F +BattleFrontier_BattleTowerLobby_Text_PutRibbonOnMons: @ 823F89F .string "{PLAYER} put the RIBBONS on\n" .string "the challenger POKéMON.$" -BattleFrontier_BattleTowerLobby_Text_23F8CD: @ 823F8CD +BattleFrontier_BattleTowerLobby_Text_DescribeFeelingsAboutBattleTower: @ 823F8CD .string "Excuse me, do you have a moment?\p" .string "Can you describe your feelings when\n" .string "you're about to begin a BATTLE TOWER\l" .string "match, or when you've either won or\l" .string "lost a match?$" -BattleFrontier_BattleTowerLobby_Text_23F969: @ 823F969 +BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouBegin: @ 823F969 .string "Okay, what are your feelings when\n" .string "you're about to begin a match?$" -BattleFrontier_BattleTowerLobby_Text_23F9AA: @ 823F9AA +BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouveWon: @ 823F9AA .string "What do you feel when you've won\n" .string "a match?$" -BattleFrontier_BattleTowerLobby_Text_23F9D4: @ 823F9D4 +BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouveLost: @ 823F9D4 .string "Can I hear about your feelings when\n" .string "you have lost a match?$" -BattleFrontier_BattleTowerLobby_Text_23FA0F: @ 823FA0F +BattleFrontier_BattleTowerLobby_Text_DontThinkMuchAboutIt: @ 823FA0F .string "Oh, so you don't think much about it?\n" .string "You're one cool customer.$" -BattleFrontier_BattleTowerLobby_Text_23FA4F: @ 823FA4F +BattleFrontier_BattleTowerLobby_Text_ChangedYourMind: @ 823FA4F .string "Hunh? You changed your mind?\n" .string "I guess you're fickle.$" -BattleFrontier_BattleTowerLobby_Text_23FA83: @ 823FA83 +BattleFrontier_BattleTowerLobby_Text_ThatsHowYouFeel: @ 823FA83 .string "Okay, so that's how you feel?\n" .string "That's quite original.\p" .string "Thanks!$" -BattleFrontier_BattleTowerLobby_Text_23FAC0: @ 823FAC0 +BattleFrontier_BattleTowerLobby_Text_WinsInRowRecorded: @ 823FAC0 .string "The number of matches you win in a row\n" .string "is recorded.\p" .string "I'd better not get beaten in\n" .string "an embarrassing way!$" -BattleFrontier_BattleTowerLobby_Text_23FB26: @ 823FB26 +BattleFrontier_BattleTowerLobby_Text_CanLeaveUntilLossOrSevenWins: @ 823FB26 .string "Once you've entered the BATTLE TOWER,\n" .string "you can't leave until you either lose\l" .string "or you beat seven TRAINERS in a row.\p" .string "You'd best be certain that you're up\n" .string "to the challenge.$" -BattleFrontier_BattleTowerLobby_Text_23FBCE: @ 823FBCE +@ Unused +BattleFrontier_BattleTowerLobby_Text_DoubleBattleRoomConstruction: @ 823FBCE .string "Welcome to the BATTLE TOWER\n" .string "DOUBLE BATTLE CORNER!\p" .string "Unfortunately, the BATTLE ROOMS\n" @@ -1099,7 +1083,8 @@ BattleFrontier_BattleTowerLobby_Text_23FBCE: @ 823FBCE .string "Please come back when the work\n" .string "is completed.$" -BattleFrontier_BattleTowerLobby_Text_23FC6B: @ 823FC6B +@ Unused +BattleFrontier_BattleTowerLobby_Text_MultiBattleRoomConstruction: @ 823FC6B .string "Welcome to the BATTLE TOWER\n" .string "MULTI BATTLE CORNER!\p" .string "Unfortunately, the BATTLE ROOMS\n" @@ -1107,32 +1092,34 @@ BattleFrontier_BattleTowerLobby_Text_23FC6B: @ 823FC6B .string "Please come back when the work\n" .string "is completed.$" -BattleFrontier_BattleTowerLobby_Text_23FD07: @ 823FD07 +BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge: @ 823FD07 .string "We look forward to seeing you on\n" .string "another challenge!$" -BattleFrontier_BattleTowerLobby_Text_23FD3B: @ 823FD3B +BattleFrontier_BattleTowerLobby_Text_WhichLevelMode: @ 823FD3B .string "The BATTLE ROOM offers two levels\n" .string "of challenge, Level 50 and Open Level.\l" .string "Which is your choice?$" -BattleFrontier_BattleTowerLobby_Text_23FD9A: @ 823FD9A +@ Unused +BattleFrontier_BattleTowerLobby_Text_PleaseSelectMons: @ 823FD9A .string "Please select the POKéMON you wish\n" .string "to enter.$" -BattleFrontier_BattleTowerLobby_Text_23FDC7: @ 823FDC7 +BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering: @ 823FDC7 .string "Before entering a BATTLE ROOM, your\n" .string "progress must be saved. Is that okay?$" -BattleFrontier_BattleTowerLobby_Text_23FE11: @ 823FE11 +BattleFrontier_BattleTowerLobby_Text_ShowYouToBattleRoom: @ 823FE11 .string "I will now show you to the\n" .string "{STR_VAR_1} BATTLE ROOM.$" -BattleFrontier_BattleTowerLobby_Text_23FE3C: @ 823FE3C +BattleFrontier_BattleTowerLobby_Text_RecordLastMatch: @ 823FE3C .string "Shall I record your last BATTLE TOWER\n" .string "match on your FRONTIER PASS?$" -BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F +@ Unused +BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50: @ 823FE7F .string "Excuse me!\p" .string "You don't have {STR_VAR_2} eligible POKéMON.\p" .string "You must have {STR_VAR_2} different POKéMON\n" @@ -1142,7 +1129,8 @@ BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F .string "EGGS{STR_VAR_1} ineligible.\p" .string "Please come see me when you are ready.$" -BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D +@ Unused +BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpen: @ 823FF5D .string "Excuse me!\p" .string "You don't have {STR_VAR_2} eligible POKéMON.\p" .string "You must have {STR_VAR_2} different POKéMON\n" @@ -1152,7 +1140,7 @@ BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D .string "EGGS{STR_VAR_1} ineligible.\p" .string "Please come see me when you are ready.$" -BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027 +BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Singles: @ 8240027 .string "Excuse me!\p" .string "You don't have three eligible POKéMON.\p" .string "You must have three different POKéMON\n" @@ -1162,7 +1150,7 @@ BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027 .string "EGGS{STR_VAR_1} ineligible.\p" .string "Please come see me when you are ready.$" -BattleFrontier_BattleTowerLobby_Text_24010B: @ 824010B +BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenSingles: @ 824010B .string "Excuse me!\p" .string "You don't have three eligible POKéMON.\p" .string "You must have three different POKéMON\n" @@ -1172,7 +1160,7 @@ BattleFrontier_BattleTowerLobby_Text_24010B: @ 824010B .string "EGGS{STR_VAR_1} ineligible.\p" .string "Please come see me when you are ready.$" -BattleFrontier_BattleTowerLobby_Text_2401DB: @ 82401DB +BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Doubles: @ 82401DB .string "Excuse me!\p" .string "You don't have four eligible POKéMON.\p" .string "You must have four different POKéMON\n" @@ -1182,7 +1170,7 @@ BattleFrontier_BattleTowerLobby_Text_2401DB: @ 82401DB .string "EGGS{STR_VAR_1} ineligible.\p" .string "Please come see me when you are ready.$" -BattleFrontier_BattleTowerLobby_Text_2402BD: @ 82402BD +BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenDoubles: @ 82402BD .string "Excuse me!\p" .string "You don't have four eligible POKéMON.\p" .string "You must have four different POKéMON\n" @@ -1192,7 +1180,7 @@ BattleFrontier_BattleTowerLobby_Text_2402BD: @ 82402BD .string "EGGS{STR_VAR_1} ineligible.\p" .string "Please come see me when you are ready.$" -BattleFrontier_BattleTowerLobby_Text_24038B: @ 824038B +BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Multis: @ 824038B .string "Excuse me!\p" .string "You don't have two eligible POKéMON.\p" .string "You must have two different POKéMON\n" @@ -1202,7 +1190,7 @@ BattleFrontier_BattleTowerLobby_Text_24038B: @ 824038B .string "EGGS{STR_VAR_1} ineligible.\p" .string "Please come see me when you are ready.$" -BattleFrontier_BattleTowerLobby_Text_24046B: @ 824046B +BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenMultis: @ 824046B .string "Excuse me!\p" .string "You don't have two eligible POKéMON.\p" .string "You must have two different POKéMON\n" @@ -1212,18 +1200,18 @@ BattleFrontier_BattleTowerLobby_Text_24046B: @ 824046B .string "EGGS{STR_VAR_1} ineligible.\p" .string "Please come see me when you are ready.$" -BattleFrontier_BattleTowerLobby_Text_240537: @ 8240537 +BattleFrontier_BattleTowerLobby_Text_WelcomSingleBattle: @ 8240537 .string "Where the talents of TRAINERS\n" .string "are put to the test!\p" .string "Welcome to the BATTLE TOWER!\p" .string "I am your guide to the SINGLE\n" .string "BATTLE ROOMS.$" -BattleFrontier_BattleTowerLobby_Text_2405B3: @ 82405B3 +BattleFrontier_BattleTowerLobby_Text_TakeSinglesChallenge: @ 82405B3 .string "Would you like to take the SINGLE\n" .string "BATTLE ROOM challenge?$" -BattleFrontier_BattleTowerLobby_Text_2405EC: @ 82405EC +BattleFrontier_BattleTowerLobby_Text_ExplainSinglesChallenge: @ 82405EC .string "The BATTLE TOWER's SINGLE BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "SINGLE BATTLES with three POKéMON.\p" @@ -1238,22 +1226,22 @@ BattleFrontier_BattleTowerLobby_Text_2405EC: @ 82405EC .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" -BattleFrontier_BattleTowerLobby_Text_2407A6: @ 82407A6 +BattleFrontier_BattleTowerLobby_Text_SelectThreeMons: @ 82407A6 .string "Now please select the three POKéMON\n" .string "that are to be entered.$" -BattleFrontier_BattleTowerLobby_Text_2407E2: @ 82407E2 +BattleFrontier_BattleTowerLobby_Text_WelcomeDoubleBattle: @ 82407E2 .string "Where the talents of TRAINERS\n" .string "are put to the test!\p" .string "Welcome to the BATTLE TOWER!\p" .string "I am your guide to the DOUBLE\n" .string "BATTLE ROOMS.$" -BattleFrontier_BattleTowerLobby_Text_24085E: @ 824085E +BattleFrontier_BattleTowerLobby_Text_TakeDoublesChallenge: @ 824085E .string "Would you like to take the DOUBLE\n" .string "BATTLE ROOM challenge?$" -BattleFrontier_BattleTowerLobby_Text_240897: @ 8240897 +BattleFrontier_BattleTowerLobby_Text_ExplainDoublesChallenge: @ 8240897 .string "The BATTLE TOWER's DOUBLE BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "DOUBLE BATTLES with four POKéMON.\p" @@ -1268,22 +1256,22 @@ BattleFrontier_BattleTowerLobby_Text_240897: @ 8240897 .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" -BattleFrontier_BattleTowerLobby_Text_240A50: @ 8240A50 +BattleFrontier_BattleTowerLobby_Text_PleaseSelectFourMons: @ 8240A50 .string "Now please select the four POKéMON\n" .string "that are to be entered.$" -BattleFrontier_BattleTowerLobby_Text_240A8B: @ 8240A8B +BattleFrontier_BattleTowerLobby_Text_WelcomeMultiBattle: @ 8240A8B .string "Where the talents of TRAINERS\n" .string "are put to the test!\p" .string "Welcome to the BATTLE TOWER!\p" .string "I am your guide to the MULTI\n" .string "BATTLE ROOMS.$" -BattleFrontier_BattleTowerLobby_Text_240B06: @ 8240B06 +BattleFrontier_BattleTowerLobby_Text_TakeMultisChallenge: @ 8240B06 .string "Would you like to take the MULTI\n" .string "BATTLE ROOM challenge?$" -BattleFrontier_BattleTowerLobby_Text_240B3E: @ 8240B3E +BattleFrontier_BattleTowerLobby_Text_ExplainMultisChallenge: @ 8240B3E .string "The BATTLE TOWER's MULTI BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "MULTI BATTLES.\p" @@ -1306,22 +1294,22 @@ BattleFrontier_BattleTowerLobby_Text_240B3E: @ 8240B3E .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" -BattleFrontier_BattleTowerLobby_Text_240DDB: @ 8240DDB +BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons: @ 8240DDB .string "Now please select the two POKéMON\n" .string "that are to be entered.$" -BattleFrontier_BattleTowerLobby_Text_240E15: @ 8240E15 +BattleFrontier_BattleTowerLobby_Text_WelcomeLinkMultiBattle: @ 8240E15 .string "Where the talents of TRAINERS\n" .string "are put to the test!\p" .string "Welcome to the BATTLE TOWER!\p" .string "I am your guide to the LINK MULTI\n" .string "BATTLE ROOMS.$" -BattleFrontier_BattleTowerLobby_Text_240E95: @ 8240E95 +BattleFrontier_BattleTowerLobby_Text_TakeLinkMultisChallenge: @ 8240E95 .string "Would you like to take the LINK MULTI\n" .string "BATTLE ROOM challenge?$" -BattleFrontier_BattleTowerLobby_Text_240ED2: @ 8240ED2 +BattleFrontier_BattleTowerLobby_Text_ExplainLinkMultisChallenge: @ 8240ED2 .string "The BATTLE TOWER's MULTI BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "MULTI BATTLES with a friend.\p" @@ -1342,73 +1330,76 @@ BattleFrontier_BattleTowerLobby_Text_240ED2: @ 8240ED2 .string "Once you start, you must battle seven\n" .string "MULTI BATTLES in a row nonstop.$" -BattleFrontier_BattleTowerLobby_Text_24115E: @ 824115E +BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons2: @ 824115E .string "Now please select the two POKéMON\n" .string "that are to be entered.$" -BattleFrontier_BattleTowerLobby_Text_241198: @ 8241198 +@ Unused +BattleFrontier_BattleTowerLobby_Text_ChoseSameMonAsFriend: @ 8241198 .string "You have chosen the same kind of\n" .string "POKéMON as your friend.\p" .string "Please choose two POKéMON different\n" .string "from your friend's, match the level\l" .string "you wish to enter, and register again.$" -BattleFrontier_BattleTowerLobby_Text_241240: @ 8241240 +BattleFrontier_BattleTowerLobby_Text_LinkMultiOnlyForTwoPlayers: @ 8241240 .string "The LINK MULTI BATTLE ROOM challenge\n" .string "is only for two linked players.$" -BattleFrontier_BattleTowerLobby_Text_241285: @ 8241285 +BattleFrontier_BattleTowerLobby_Text_FriendAlsoSelectedMon: @ 8241285 .string "Your friend has also selected\n" .string "the POKéMON {STR_VAR_1}.$" -BattleFrontier_BattleTowerLobby_Text_2412B3: @ 82412B3 +BattleFrontier_BattleTowerLobby_Text_FriendAlsoSelectedMons: @ 82412B3 .string "Your friend has also selected the\n" .string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$" -BattleFrontier_BattleTowerLobby_Text_2412E8: @ 82412E8 +BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlMode: @ 82412E8 .string "Your friend has chosen a different\n" .string "battle level.$" -BattleFrontier_BattleTowerLobby_Text_241319: @ 8241319 +@ Unused +BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlModeSameMon: @ 8241319 .string "Your friend has chosen a different\n" .string "battle level.\p" .string "Your friend has also selected\n" .string "the POKéMON {STR_VAR_1}.$" -BattleFrontier_BattleTowerLobby_Text_241378: @ 8241378 +@ Unused +BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlModeSameMons: @ 8241378 .string "Your friend has chosen a different\n" .string "battle level.\p" .string "Your friend has also selected the\n" .string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$" -BattleFrontier_BattleTowerLobby_Text_2413DE: @ 82413DE +BattleFrontier_BattleTowerLobby_Text_ChooseDifferentMonsMatchLvlMode: @ 82413DE .string "Please choose two POKéMON different\n" .string "from your friend's, match the level\l" .string "you wish to enter, and register again.$" -BattleFrontier_BattleTowerLobby_Text_24144D: @ 824144D +BattleFrontier_BattleTowerLobby_Text_SaveGameBeforeShowingIn: @ 824144D .string "I will save the game before\n" .string "showing you in. Please wait.$" -BattleFrontier_BattleTowerLobby_Text_241486: @ 8241486 +BattleFrontier_BattleTowerLobby_Text_CongratsDefeatedMaiden: @ 8241486 .string "Congratulations!\n" .string "You have defeated the SALON MAIDEN\l" .string "and swept seven TRAINERS!$" -BattleFrontier_BattleTowerLobby_Text_2414D4: @ 82414D4 +BattleFrontier_BattleTowerLobby_Text_AwardYouTheseBattlePoints: @ 82414D4 .string "In recognition of your infinite talent,\n" .string "we award you these Battle Point(s).$" BattleFrontier_Text_ObtainedXBattlePoints: @ 8241520 .string "{PLAYER} obtained {STR_VAR_1} Battle Point(s).$" -BattleFrontier_BattleTowerLobby_Text_241540: @ 8241540 +BattleFrontier_BattleTowerLobby_Text_RulesAreListed: @ 8241540 .string "The BATTLE TOWER rules are listed.$" -BattleFrontier_BattleTowerLobby_Text_241563: @ 8241563 +BattleFrontier_BattleTowerLobby_Text_ReadWhichHeading: @ 8241563 .string "Which heading do you want to read?$" -BattleFrontier_BattleTowerLobby_Text_241586: @ 8241586 +BattleFrontier_BattleTowerLobby_Text_ExplainTowerRules: @ 8241586 .string "The BATTLE TOWER is a facility where\n" .string "four types of battles are waged--\l" .string "SINGLE BATTLE, DOUBLE BATTLE, MULTI\l" @@ -1418,7 +1409,7 @@ BattleFrontier_BattleTowerLobby_Text_241586: @ 8241586 .string "Please speak with a guide offering\n" .string "the type of battle you wish to enter.$" -BattleFrontier_BattleTowerLobby_Text_241693: @ 8241693 +BattleFrontier_BattleTowerLobby_Text_ExplainMonRules: @ 8241693 .string "Depending on the BATTLE ROOM you are\n" .string "entering, you will be required to take\l" .string "a certain number of POKéMON.\p" @@ -1427,7 +1418,7 @@ BattleFrontier_BattleTowerLobby_Text_241693: @ 8241693 .string "The DOUBLE BATTLE mode requires four,\n" .string "and the MULTI modes both require two.$" -BattleFrontier_BattleTowerLobby_Text_241777: @ 8241777 +BattleFrontier_BattleTowerLobby_Text_ExplainSalonRules: @ 8241777 .string "The BATTLE SALON is where you must\n" .string "find a partner to form a tag team for\l" .string "the MULTI BATTLE ROOM challenge.\p" @@ -1437,7 +1428,7 @@ BattleFrontier_BattleTowerLobby_Text_241777: @ 8241777 .string "You may choose a new tag partner\n" .string "after winning seven straight matches.$" -BattleFrontier_BattleTowerLobby_Text_24187E: @ 824187E +BattleFrontier_BattleTowerLobby_Text_ExplainMultiLinkRules: @ 824187E .string "The LINK MULTI BATTLE Mode is for two\n" .string "friends to mount a challenge together.\p" .string "You and your friend must be linked with\n" diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json index a82fc2d547..223455f693 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -1,7 +1,7 @@ { "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", "name": "BattleFrontier_BattleTowerMultiBattleRoom", - "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", "music": "MUS_SATTOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, @@ -9,127 +9,88 @@ "map_type": "MAP_TYPE_INDOOR", "allow_bike": false, "allow_escape_rope": false, - "allow_running": true, + "allow_running": false, "show_map_name": false, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_TEALA", - "x": 11, - "y": 2, + "graphics_id": "OBJ_EVENT_GFX_VAR_0", + "x": 5, + "y": 1, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_x": 0, + "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A", + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" + }, + { + "graphics_id": "OBJ_EVENT_GFX_TEALA", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "0x0", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_VAR_0", - "x": 2, - "y": 10, + "graphics_id": "OBJ_EVENT_GFX_TEALA", + "x": 1, + "y": 5, "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29", - "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1" + "script": "0x0", + "flag": "0" }, { "graphics_id": "OBJ_EVENT_GFX_VAR_1", - "x": 17, - "y": 11, + "x": 4, + "y": 1, "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", - "movement_range_x": 1, - "movement_range_y": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB", - "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, { - "graphics_id": "OBJ_EVENT_GFX_VAR_2", - "x": 6, - "y": 9, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008", - "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3" - }, - { - "graphics_id": "OBJ_EVENT_GFX_VAR_3", - "x": 8, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015", - "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4" - }, - { - "graphics_id": "OBJ_EVENT_GFX_VAR_4", - "x": 10, - "y": 11, + "graphics_id": "OBJ_EVENT_GFX_VAR_F", + "x": 4, + "y": 8, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_x": 0, + "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022", - "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5" + "script": "0x0", + "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_VAR_5", - "x": 13, - "y": 10, + "graphics_id": "OBJ_EVENT_GFX_VAR_E", + "x": 5, + "y": 8, "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", - "movement_range_x": 1, - "movement_range_y": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F", - "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6" - }, - { - "graphics_id": "OBJ_EVENT_GFX_VAR_6", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C", - "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1" - }, - { - "graphics_id": "OBJ_EVENT_GFX_VAR_7", - "x": 4, - "y": 12, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049", - "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2" + "script": "0x0", + "flag": "0" } ], "warp_events": [], diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 7caf9c5938..3c549a9193 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -1,1816 +1,513 @@ -BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 - map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7 - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23 +BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8248EE8 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiBattleRoom_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_OnFrame .byte 0 -BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 - pyramid_resetparty + @ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden + @ The player is represented instead by object event 5, which has the gfx id VAR_OBJ_GFX_ID_F + @ The multi partner is represented by object event 6, which has the gfx id VAR_OBJ_GFX_ID_E + +BattleFrontier_BattleTowerMultiBattleRoom_OnTransition: @ 8248EF8 + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS + call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS + call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx end -BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 - goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA - clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 - clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 - clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 - clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 - clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 - clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 - setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 - setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 - setvar VAR_0x8004, BATTLE_TOWER_FUNC_10 - special CallBattleTowerFunc - end +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx:: @ 8248F0F + tower_setpartnergfx + checkplayergender + compare VAR_RESULT, FEMALE + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL + return -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA - setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_BOY_1 - setvar VAR_TEMP_1, 1 - setvar VAR_TEMP_3, 1 - setobjectxyperm 1, 10, 2 - end +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8248F29 + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL + return -BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14 - map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx:: @ 8248F2F + special SetBattleTowerLinkPlayerGfx + return + +BattleFrontier_BattleTowerMultiBattleRoom_OnWarp: @ 8248F33 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj .2byte 0 -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj:: @ 8248F3D + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM end -BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23 - map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41 - map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35 +BattleFrontier_BattleTowerMultiBattleRoom_OnFrame: @ 8248F43 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom .2byte 0 -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35 - lockall - setvar VAR_TEMP_3, 0 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 - lockall - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom:: @ 8248F4D + setvar VAR_TEMP_0, 1 + applymovement 5, BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom + applymovement 6, BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom waitmovement 0 - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 - waitmovement 0 - copyobjectxytoperm 1 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp - waitmovement 0 - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT - special HealPlayerParty - setvar VAR_TEMP_1, 1 - releaseall - end - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75: @ 8243E75 - walk_down - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77: @ 8243E77 - walk_left - walk_in_place_fastest_down - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A - lock - faceplayer - message BattleFrontier_BattleTowerMultiBattleRoom_Text_244094 - waitmessage - multichoicedefault 20, 8, MULTI_YESNO, 1, 0 + frontier_get FRONTIER_DATA_BATTLE_NUM compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, MSGBOX_DEFAULT - release - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D - frontier_set FRONTIER_DATA_6, 1 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT - closemessage - applymovement 1, Common_Movement_WalkInPlaceFastestUp + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter + applymovement 2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer + applymovement 3, BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer waitmovement 0 - opendoor 10, 1 - waitdooranim - call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4 - closedoor 10, 1 - waitdooranim - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - waitstate - releaseall - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4 - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A + applymovement 5, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant + applymovement 6, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant waitmovement 0 - return + frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6 - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter:: @ 8248FB4 + tower_setopponent + addobject 1 + addobject 4 + applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter + applymovement 4, BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Enter waitmovement 0 - return - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08 - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink + tower_getopponentintro 0 + delay 15 + applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft waitmovement 0 - return - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A: @ 8243F1A - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E: @ 8243F1E - walk_right - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22: @ 8243F22 - walk_left - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26 - walk_up - set_invisible - step_end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 - lock - faceplayer - setvar VAR_TEMP_2, 0 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 - goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 - setvar VAR_0x8004, BATTLE_TOWER_FUNC_11 - setvar VAR_0x8005, 0 - special CallBattleTowerFunc + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage - waitbuttonpress - setvar VAR_0x8004, BATTLE_TOWER_FUNC_11 - setvar VAR_0x8005, 1 - special CallBattleTowerFunc + tower_getopponentintro 1 + applymovement 4, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft + waitmovement 0 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage - waitbuttonpress - setvar VAR_0x8004, BATTLE_TOWER_FUNC_11 - setvar VAR_0x8005, 2 - special CallBattleTowerFunc + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink:: @ 8249026 + tower_getopponentintro 0 + delay 15 + applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft + waitmovement 0 + messageautoscroll gStringVar4 + waitmessage + delay 48 + tower_getopponentintro 1 + applymovement 4, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft + waitmovement 0 + messageautoscroll gStringVar4 + waitmessage + delay 48 +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle:: @ 8249069 + call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle + switch VAR_RESULT + case B_OUTCOME_WON, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost:: @ 824907E + frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST + tower_set TOWER_DATA_LVL_MODE + setvar VAR_0x8004, 3 + special Script_TryGainNewFanFromCounter + goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents:: @ 82490AA + call BattleFrontier_EventScript_IncrementWinStreak + tower_setbattlewon + switch VAR_RESULT + case 7, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyWon + applymovement 4, BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Exit + applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Exit + waitmovement 0 + removeobject 1 + removeobject 4 + applymovement 2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer + applymovement 3, BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer + waitmovement 0 + applymovement 5, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant + applymovement 6, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant + waitmovement 0 + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetorePartyMsgLink + msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetorePartyMsgLink:: @ 8249118 + messageautoscroll BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth + waitmessage + delay 48 +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: @ 8249121 + special LoadPlayerParty + frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS + call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_249514 + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8249143 + frontier_get FRONTIER_DATA_BATTLE_NUM + call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge + call BattleFrontier_EventScript_GetCantRecordBattle + compare VAR_RESULT, TRUE + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoRecord + multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge + case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattle + case 2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskPauseChallenge + case 3, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoRecord:: @ 82491B1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge + case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskPauseChallenge + case 2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattle:: @ 82491E7 + message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT - case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 - case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 - setvar VAR_0x8004, BATTLE_TOWER_FUNC_11 - setvar VAR_0x8005, 3 - special CallBattleTowerFunc + case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RecordBattle + case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RecordBattle:: @ 8249219 + call BattleFrontier_EventScript_SaveBattle + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskPauseChallenge:: @ 8249223 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO + switch VAR_RESULT + case NO, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + case YES, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge + case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge:: @ 8249251 + message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge waitmessage - waitbuttonpress + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost + case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge:: @ 8249283 closemessage - compare VAR_FACING, DIR_SOUTH - call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 - compare VAR_FACING, DIR_SOUTH - call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF - removeobject VAR_LAST_TALKED - setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER - warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 - waitstate - release + clearflag FLAG_TEMP_2 + applymovement 5, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle + applymovement 6, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle + waitmovement 0 + applymovement 2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantReturnToPos + applymovement 3, BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantReturnToPos + waitmovement 0 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter end -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3:: @ 8243FC3 - setvar VAR_0x8004, BATTLE_TOWER_FUNC_11 - setvar VAR_0x8005, 4 - special CallBattleTowerFunc +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyWon:: @ 82492AF + frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON + tower_set TOWER_DATA_LVL_MODE + setvar VAR_0x8004, 3 + special Script_TryGainNewFanFromCounter + goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge:: @ 82492DB + message BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait waitmessage - waitbuttonpress - release + tower_save CHALLENGE_STATUS_PAUSED + playse SE_SAVE + waitse + fadescreen 1 + frontier_reset end -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4:: @ 8243FD4 - applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA - waitmovement 0 +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet:: @ 82492FD + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLink + copyvar VAR_TEMP_F, VAR_RESULT + switch VAR_TEMP_F + case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSet + case 2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSet + case 3, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSet + case 4, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSet + case 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSet + case 6, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSet + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSet:: @ 8249354 + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet + waitmessage return -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF:: @ 8243FDF - applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2 - waitmovement 0 +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSet:: @ 824935B + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet + waitmessage return -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA: @ 8243FEA - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSet:: @ 8249362 + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet + waitmessage + return + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSet:: @ 8249369 + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet + waitmessage + return + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSet:: @ 8249370 + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet + waitmessage + return + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSet:: @ 8249377 + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet + waitmessage + return + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLink:: @ 824937E + copyvar VAR_TEMP_F, VAR_RESULT + switch VAR_TEMP_F + case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSetLink + case 2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSetLink + case 3, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSetLink + case 4, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSetLink + case 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSetLink + case 6, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSetLink + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSetLink:: @ 82493CA + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet + waitmessage + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSetLink:: @ 82493D6 + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet + waitmessage + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSetLink:: @ 82493E2 + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet + waitmessage + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSetLink:: @ 82493EE + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet + waitmessage + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSetLink:: @ 82493FA + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet + waitmessage + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSetLink:: @ 8249406 + message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet + waitmessage + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg:: @ 8249412 + waitmessage + delay 48 + return + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink:: @ 8249417 + goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNoRecord + multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink + case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink + case 2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink + case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNoRecord:: @ 8249457 + multichoice 20, 8, MULTI_GO_ON_RETIRE, 1 + switch VAR_RESULT + case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink + case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink + case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink:: @ 8249483 + setvar VAR_0x8004, BATTLE_TOWER_LINK_CONTINUE + setvar VAR_0x8005, 0 + message gText_LinkStandby3 + waitmessage + special LinkRetireStatusWithBattleTowerPartner + waitstate + compare VAR_RESULT, BATTLE_TOWER_LINKSTAT_CONTINUE + goto_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink:: @ 82494A8 + message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle + waitmessage + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + call BattleFrontier_EventScript_SaveBattle + setflag FLAG_TEMP_2 + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink:: @ 82494DD + message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge + waitmessage + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 + compare VAR_RESULT, 0 + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents + end + +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink:: @ 82494FA + setvar VAR_0x8004, BATTLE_TOWER_LINK_RETIRE + setvar VAR_0x8005, 0 + message gText_LinkStandby3 + waitmessage + special LinkRetireStatusWithBattleTowerPartner + waitstate + goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost + end + +@ Some link function. Sets battle type flags at least +BattleFrontier_BattleTowerMultiBattleRoom_EventScript_249514:: @ 8249514 + special sub_813B534 + return + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom: @ 8249518 + walk_up + walk_up + walk_up + walk_up + face_right step_end -BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2: @ 8243FF2 - walk_fast_left - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up - walk_fast_up +BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom: @ 824951E + walk_left + walk_up + walk_up + walk_up + face_right step_end -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB:: @ 8243FFB - lock - faceplayer - setvar VAR_TEMP_2, 1 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008:: @ 8244008 - lock - faceplayer - setvar VAR_TEMP_2, 2 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015:: @ 8244015 - lock - faceplayer - setvar VAR_TEMP_2, 3 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022:: @ 8244022 - lock - faceplayer - setvar VAR_TEMP_2, 4 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F:: @ 824402F - lock - faceplayer - setvar VAR_TEMP_2, 5 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C:: @ 824403C - lock - faceplayer - setvar VAR_TEMP_2, 6 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049:: @ 8244049 - lock - faceplayer - setvar VAR_TEMP_2, 7 - goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36 - end - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244056: @ 8244056 - .string "Please find a partner from out of\n" - .string "the TRAINERS gathered here.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244094: @ 8244094 - .string "{PLAYER}, you have not found a partner\n" - .string "for your tag team.\p" - .string "Would you like to quit looking and\n" - .string "return to the reception counter?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C: @ 824410C - .string "Then, please find a partner from\n" - .string "the TRAINERS gathered here.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244149:: @ 8244149 - .string "Thank you for choosing a partner.\p" - .string "I will now show you to your\n" - .string "MULTI BATTLE ROOM.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24419A:: @ 824419A - .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" - .string "You can call me {STR_VAR_3}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2441CA:: @ 82441CA - .string "On {STR_VAR_1}'s advice, I brought\n" - .string "one {STR_VAR_3} with {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Please, let me join you as a tag team.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24422E:: @ 824422E - .string "Thank you!\n" - .string "I'll go register right now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244255:: @ 8244255 - .string "I really wanted to form a tag team\n" - .string "with you, {PLAYER}…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244286:: @ 8244286 - .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" - .string "My name is {STR_VAR_3}.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2 - .string "I got advice from {STR_VAR_1} and chose\n" - .string "one {STR_VAR_3} with {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2442E4:: @ 82442E4 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Please, let's form a tag team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244313:: @ 8244313 - .string "Thank you very much!\n" - .string "I'll be done with registration quickly!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244350:: @ 8244350 - .string "{PLAYER}, I was hoping that I could\n" - .string "partner up with you…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244383:: @ 8244383 - .string "Um, my name's {STR_VAR_3}, and I'm\n" - .string "{STR_VAR_1}'s no. {STR_VAR_2} apprentice.\p" - .string "Snivel…\p" - .string "I'm sorry!\n" - .string "This tension is making me cry…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7:: @ 82443E7 - .string "{STR_VAR_3} advised me, so I have\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244413:: @ 8244413 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Snivel…\n" - .string "Please, please team up with me!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B:: @ 824444B - .string "Oh, really? You will?\n" - .string "Awesome! Wicked! Awoooh!\p" - .string "Oh… I'm sorry…\n" - .string "I'm so happy, I'm crying…\p" - .string "I'll go register right away.\n" - .string "Please don't go away!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6:: @ 82444D6 - .string "Oh, b-but…\n" - .string "Sob… Waaaaah!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF:: @ 82444EF - .string "Hi, there! I'm {STR_VAR_3}!\n" - .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E - .string "{STR_VAR_3} recommended my crew.\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244549:: @ 8244549 - .string "one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that's what I have! Cool, huh?\p" - .string "So come on!\n" - .string "Let's form a tag team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B:: @ 824459B - .string "Yay! Great!\n" - .string "Okay, I'll go register, okay?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5:: @ 82445C5 - .string "Aww, why?\n" - .string "I wanted to team up, {PLAYER}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8:: @ 82445E8 - .string "I'm {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n" - .string "of the famous {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618 - .string "I looked to {STR_VAR_3} for advice.\n" - .string "One {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244643:: @ 8244643 - .string "and one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that's my pair.\p" - .string "Please, will you join me in\n" - .string "a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F:: @ 824468F - .string "Thank you!\n" - .string "I'll register right away!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4:: @ 82446B4 - .string "{PLAYER}, I had been hoping to join\n" - .string "you in a tag team…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5:: @ 82446E5 - .string "Um… I'm sincerely happy that you\n" - .string "would take the time to talk to me.\p" - .string "I'm {STR_VAR_3}.\n" - .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D:: @ 824474D - .string "{STR_VAR_3} gave me advice.\n" - .string "I'm very grateful for it.\p" - .string "I have a team of one {STR_VAR_2}\n" - .string "with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E:: @ 824479E - .string "one {STR_VAR_2} with {STR_VAR_1}.\n" - .string "I know I'm asking a lot…\p" - .string "I don't think you'll be willing to,\n" - .string "but may I join you as a partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C:: @ 824480C - .string "Really? I can't believe it!\n" - .string "I can't believe you'll let me join you!\l" - .string "I… I won't let you down!\p" - .string "Um… If it's really okay, I'll go register\n" - .string "right this instant!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7:: @ 82448A7 - .string "Oh…\n" - .string "I didn't think I was good enough…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD:: @ 82448CD - .string "Hi, I'm {STR_VAR_3}.\n" - .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5:: @ 82448F5 - .string "{STR_VAR_3} told me that it would be\n" - .string "good to make this team:\l" - .string "one {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244939:: @ 8244939 - .string "and one {STR_VAR_2} that knows how\n" - .string "to use {STR_VAR_1}.\p" - .string "Not bad, huh?\n" - .string "Want me to team up with you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244989:: @ 8244989 - .string "Okay, glad to join you!\n" - .string "I hope you won't mess things up for me!\l" - .string "I'll do my registration now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6:: @ 82449E6 - .string "Huh? Why did you turn me down?\n" - .string "You're no judge of character!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23:: @ 8244A23 - .string "I'm {STR_VAR_3} and I'm a TRIATHLETE.\n" - .string "I'm busy every day what with jogging,\l" - .string "training, and rapping.\p" - .string "I also happen to be {STR_VAR_1}'s\n" - .string "no. {STR_VAR_2} apprentice.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9:: @ 8244AA9 - .string "This is what {STR_VAR_3} recommended.\n" - .string "One {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6:: @ 8244AD6 - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2}.\p" - .string "I put a lot of effort into raising\n" - .string "them, even though I'm busy.\p" - .string "Let's form a tag team\n" - .string "and give it a go!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52:: @ 8244B52 - .string "Thanks, that's the spirit!\n" - .string "Hang tight while I go register, okay?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93 - .string "I took time from my busy schedule\n" - .string "to be here! Give me a break!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2:: @ 8244BD2 - .string "Hi!\n" - .string "How's it going?\p" - .string "I'm {STR_VAR_3}, {STR_VAR_1}'s\n" - .string "no. {STR_VAR_2} apprentice. Glad to meet you!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18:: @ 8244C18 - .string "Listen, listen! You have to hear about\n" - .string "the POKéMON {STR_VAR_3} recommended.\l" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E:: @ 8244C6E - .string "one {STR_VAR_2} with {STR_VAR_1}.\n" - .string "Of course I raised them superbly!\p" - .string "So, want to team up?\n" - .string "I'm sure it'll be a great combo!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6:: @ 8244CD6 - .string "Yay, I think this will be fun!\n" - .string "I'll go register!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07:: @ 8244D07 - .string "Oh, you're mean!\n" - .string "I come recommended, you know.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36:: @ 8244D36 - .string "Please let me introduce myself.\n" - .string "I am {STR_VAR_3}.\p" - .string "I serve as {STR_VAR_1}'s\n" - .string "no. {STR_VAR_2} apprentice.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82:: @ 8244D82 - .string "I sought the sage advice of\n" - .string "{STR_VAR_3} and raised my team\l" - .string "of one {STR_VAR_2} with {STR_VAR_1}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6:: @ 8244DC6 - .string "and one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Please agree to a tag team with me!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE:: @ 8244DFE - .string "Oh… I'm delighted!\n" - .string "I promise to give you my best!\p" - .string "Of course I will register us!\n" - .string "Please wait!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B:: @ 8244E5B - .string "I had been hoping to join you,\n" - .string "{PLAYER}…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E:: @ 8244E7E - .string "Eek! You spoke to me!\n" - .string "I… I'm overjoyed!\p" - .string "I'm {STR_VAR_3}! I'm {STR_VAR_1}'s\n" - .string "no. {STR_VAR_2} apprentice!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA:: @ 8244ECA - .string "On {STR_VAR_3}'s advice, I trained\n" - .string "one {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4 - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2}.\p" - .string "Please, can you grant me my wish?\n" - .string "I want to be your tag-team partner!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F:: @ 8244F4F - .string "Eek! I… I feel giddy!\n" - .string "Thank you so much!\l" - .string "I'll go register us right away!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98:: @ 8244F98 - .string "Waaah! Don't you feel any pity?\n" - .string "But that makes you cooler…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3:: @ 8244FD3 - .string "Yeehaw! I'm {STR_VAR_1}'s\n" - .string "no. {STR_VAR_2} apprentice!\p" - .string "{STR_VAR_3}'s my name, hello, hello!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245013:: @ 8245013 - .string "My mentor {STR_VAR_3} recommended\n" - .string "one {STR_VAR_1}-master {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D:: @ 824503D - .string "and one {STR_VAR_1}-master\n" - .string "{STR_VAR_2}.\p" - .string "Good stuff, huh?\n" - .string "You'll partner with me, won't you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245087:: @ 8245087 - .string "Okay, excellent!\n" - .string "I'll get the registration done quickly!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0:: @ 82450C0 - .string "Gwaaah!\n" - .string "You're a calculating one, {PLAYER}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6:: @ 82450E6 - .string "Hey! There's big trouble! This is\n" - .string "the BATTLE TOWER's last day!\p" - .string "… … … … … …\n" - .string "I'm only joking!\p" - .string "People call me {STR_VAR_3} and I do, too!\n" - .string "I'm {STR_VAR_1}'s 1,000th apprentice!\l" - .string "Actually, I'm no. {STR_VAR_2}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196 - .string "{STR_VAR_3} gave me some advice.\n" - .string "{STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD:: @ 82451BD - .string "{STR_VAR_2} with {STR_VAR_1}.\n" - .string "I've got ten of each kind!\l" - .string "Actually, just one of each!\p" - .string "How about it?\n" - .string "Want to try tag battles with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F:: @ 824522F - .string "Yippee!\n" - .string "I'll give you a POKéMON as my thanks!\p" - .string "Just joking! But I will really go do\n" - .string "the registration, okay?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A:: @ 824529A - .string "Oh, that's so cold! I'll have to wreck\n" - .string "the BATTLE TOWER for that!\p" - .string "Of course I won't!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF:: @ 82452EF - .string "Hey, there, I'm rockin' and a-rollin'!\n" - .string "POKéMON, I be controllin'!\p" - .string "I'm {STR_VAR_3} the rappin' SAILOR.\n" - .string "Don't be mistakin' me for no wailer!\p" - .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" - .string "Me, you shouldn't be quick to dismiss!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4:: @ 82453B4 - .string "With the advice of {STR_VAR_3} I did\n" - .string "abide, put together my team of pride!\l" - .string "One {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245406:: @ 8245406 - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2}!\p" - .string "Our meeting we should commemorate,\n" - .string "with a tag-team victory to celebrate!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245464:: @ 8245464 - .string "Hey, hey, I like your style!\n" - .string "Our registration, I will go file!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3:: @ 82454A3 - .string "Oh, hey, {PLAYER}, now that's cold!\n" - .string "If I may be so bold!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6:: @ 82454D6 - .string "Yippee-yahoo!\n" - .string "Oh, don't run! I was just having fun!\p" - .string "Howdy! I'm {STR_VAR_3}!\n" - .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245535:: @ 8245535 - .string "{STR_VAR_3} told me what to do.\n" - .string "So one {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F:: @ 824555F - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2}, I did choose.\p" - .string "So, what do you say?\n" - .string "Come on, make my day!\p" - .string "Please, I'm begging you!\n" - .string "Let me join you, don't leave me blue!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC:: @ 82455EC - .string "Yeahah! Luck is with me!\n" - .string "It sure makes me happy!\p" - .string "Before we go join the fray,\n" - .string "I'll go register right away!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245656:: @ 8245656 - .string "You're turning me down?\n" - .string "{PLAYER}, you're making me frown!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A:: @ 824568A - .string "Cough!\p" - .string "Oh, sorry, I have a cold.\n" - .string "My POKéMON are fine, though.\p" - .string "My name's {STR_VAR_3}, {STR_VAR_1}'s\n" - .string "no. {STR_VAR_2} apprentice. Cough!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5:: @ 82456F5 - .string "I took {STR_VAR_3}'s advice to heart\n" - .string "and put together my team of\l" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245740:: @ 8245740 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "I trained them every day,\n" - .string "even in wind and rain.\p" - .string "That's why I have this cold,\n" - .string "I think.\p" - .string "That's what I'm about.\n" - .string "Want to be my tag partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9 - .string "Thanks, I appreciate this!\n" - .string "Cough, cough!\l" - .string "Hang on while I go register.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F:: @ 824581F - .string "Oh, you won't?\n" - .string "{PLAYER}, I think we'd make a good pair.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245851:: @ 8245851 - .string "Oh, hello!\n" - .string "This is nerve-racking.\p" - .string "I'm {STR_VAR_3}.\n" - .string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C:: @ 824589C - .string "{STR_VAR_3} said this team'll be good--\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE:: @ 82458CE - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "I'm feeling self-conscious about this,\n" - .string "but will you let me join you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245923:: @ 8245923 - .string "Oh, gee, thank you!\n" - .string "I feel bashful, but I'll do my best!\p" - .string "I'll go get the registration done.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F:: @ 824597F - .string "Oh, please don't say no!\n" - .string "I feel self-conscious enough already…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE:: @ 82459BE - .string "I am {STR_VAR_3}, and that's no lie.\n" - .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7:: @ 82459F7 - .string "{STR_VAR_3} recommended my team.\p" - .string "Since the advice sounded sincere,\n" - .string "I decided to bring with me\l" - .string "my {STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F:: @ 8245A5F - .string "my {STR_VAR_1}-using {STR_VAR_2}.\p" - .string "If possible, I would like you to accept\n" - .string "me as your tag-team partner.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4:: @ 8245AB4 - .string "You really will accept me?\n" - .string "It would be too terrible otherwise.\p" - .string "But since you've agreed, this is fine.\n" - .string "I shall go register the both of us.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E - .string "Hm? Now why would you refuse?\n" - .string "Is this your idea of a joke?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79:: @ 8245B79 - .string "I'm {STR_VAR_1}, and I'm a LASS!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91:: @ 8245B91 - .string "What I have are one {STR_VAR_2}\n" - .string "that uses {STR_VAR_1} and one$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD:: @ 8245BBD - .string "{STR_VAR_2} that uses {STR_VAR_1}.\n" - .string "Those are what I have with me.\p" - .string "Will you be my partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05:: @ 8245C05 - .string "Thank you!\n" - .string "I'll go do the registration!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D:: @ 8245C2D - .string "You don't want to be my partner?\n" - .string "You'll regret it later!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66:: @ 8245C66 - .string "Hello!\p" - .string "I'm YOUNGSTER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F - .string "Want to know what I have?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC:: @ 8245CAC - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "You'll be my tag-team partner,\n" - .string "won't you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6:: @ 8245CE6 - .string "Yay!\n" - .string "I'll go and register, okay?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07:: @ 8245D07 - .string "Aww! If you'd form a tag team with\n" - .string "my POKéMON, we'd be unstoppable!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B:: @ 8245D4B - .string "Yahoo!\n" - .string "I'm HIKER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60:: @ 8245D60 - .string "Know what I have with me?\n" - .string "My {STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D:: @ 8245D8D - .string "my {STR_VAR_1}-using {STR_VAR_2}!\p" - .string "Sounds good, eh?\n" - .string "Want to form a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7:: @ 8245DC7 - .string "Yahoo!\n" - .string "I'll go do the registering, then.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0:: @ 8245DF0 - .string "I would've liked to battle with you\n" - .string "at my side.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20:: @ 8245E20 - .string "Hello!\n" - .string "I'm {STR_VAR_1}, and I'm a BEAUTY!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41:: @ 8245E41 - .string "Do you know what I've been raising?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "What do you think?\n" - .string "Want to make a tag team together?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD:: @ 8245EBD - .string "Wonderful!\n" - .string "I'll get the registration done now!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC:: @ 8245EEC - .string "How disappointing!\p" - .string "We two together--we would've been\n" - .string "the best!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B:: @ 8245F2B - .string "Yo!\p" - .string "You know who I am?\n" - .string "I'm {STR_VAR_1} the FISHERMAN!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58:: @ 8245F58 - .string "I've got with me a team of one\n" - .string "{STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87 - .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" - .string "So, how about it?\n" - .string "Will you battle at my side?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6:: @ 8245FC6 - .string "Good, good!\n" - .string "Leave it up to me!\p" - .string "I'll go and register us now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246002:: @ 8246002 - .string "We matched up perfectly, too…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246020:: @ 8246020 - .string "Glad to make your acquaintance.\n" - .string "I am {STR_VAR_1}, a LADY.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246051:: @ 8246051 - .string "I am accompanied by a team of\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246082:: @ 8246082 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "I hope I meet your approval.\n" - .string "For I wish to have you as my partner.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5:: @ 82460D5 - .string "I thank you sincerely.\n" - .string "I shall handle the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D:: @ 824610D - .string "I'm sure that you will regret not\n" - .string "having me as your partner.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A:: @ 824614A - .string "I'm TRIATHLETE {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D - .string "What I have…\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D:: @ 824617D - .string "one {STR_VAR_2} with {STR_VAR_1}!\n" - .string "That's my pair!\p" - .string "Please?\n" - .string "Will you form a tag team with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7:: @ 82461C7 - .string "Gee, thanks!\n" - .string "I'll go register at the counter.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5:: @ 82461F5 - .string "We two together, we would've been\n" - .string "tough for certain!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A:: @ 824622A - .string "Hiya!\n" - .string "I'm BUG CATCHER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246244:: @ 8246244 - .string "Check out what I have!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E:: @ 824626E - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "So, listen!\n" - .string "Do you want to form a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA:: @ 82462AA - .string "Gotcha!\p" - .string "I'll go do the registration stuff\n" - .string "at the counter.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4:: @ 82462E4 - .string "Aww, my POKéMON are awesome.\n" - .string "I hope you won't regret this!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F:: @ 824631F - .string "Good day!\n" - .string "I'm SCHOOL KID {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C:: @ 824633C - .string "What I've been raising are one\n" - .string "{STR_VAR_2} that uses {STR_VAR_1}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B:: @ 824636B - .string "and one {STR_VAR_2} that uses\n" - .string "{STR_VAR_1}.\p" - .string "Not too bad, don't you think?\n" - .string "Would you care to form a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5:: @ 82463C5 - .string "Thank you very much!\n" - .string "I'll get done with the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF:: @ 82463FF - .string "That's too bad…\p" - .string "I was hoping that I could learn\n" - .string "from you as your partner…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246449:: @ 8246449 - .string "Yo! Let me tell you who I am!\n" - .string "I'm RICH BOY {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478 - .string "Guess what I got!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D:: @ 824649D - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "I'm willing to offer you the chance\n" - .string "to be in a tag team with me.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE:: @ 82464EE - .string "Smart move!\p" - .string "I'll finish up the registration\n" - .string "process quick!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246529:: @ 8246529 - .string "You'd turn me of all people down?\n" - .string "You'll regret that decision for sure!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246571:: @ 8246571 - .string "Hiyah!\n" - .string "I am BLACK BELT {STR_VAR_1}.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C:: @ 824658C - .string "As my companions, I have\n" - .string "one {STR_VAR_2} using {STR_VAR_1}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5:: @ 82465B5 - .string "and one {STR_VAR_2} using\n" - .string "{STR_VAR_1}.\p" - .string "Please, grant me my wish!\n" - .string "Allow me to be your tag partner!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246605:: @ 8246605 - .string "Hiyah!\n" - .string "I will go register forthwith!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A:: @ 824662A - .string "I see… I hope for an opportunity\n" - .string "the next time we meet…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246662:: @ 8246662 - .string "Hi, there!\n" - .string "I'm {STR_VAR_1}, and I'm a TUBER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246686:: @ 8246686 - .string "I'll tell you what I have.\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4 - .string "one {STR_VAR_2} with {STR_VAR_1}!\n" - .string "May I please be on your tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6:: @ 82466E6 - .string "Thank you!\n" - .string "I'll go register us now!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A:: @ 824670A - .string "If we'd become partners, we could\n" - .string "have been so strong!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246741:: @ 8246741 - .string "Greetings…\n" - .string "I am HEX MANIAC {STR_VAR_1}…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246760:: @ 8246760 - .string "I bear with me one {STR_VAR_1}-using\n" - .string "{STR_VAR_2} together with one$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246791:: @ 8246791 - .string "{STR_VAR_1}-using {STR_VAR_2}…\p" - .string "I beseech you…\n" - .string "Join me in a tag team…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4:: @ 82467C4 - .string "I thank you…\n" - .string "I shall register us…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6:: @ 82467E6 - .string "I so longed to join you…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF:: @ 82467FF - .string "How do you do? I'm {STR_VAR_1},\n" - .string "and I'm a POKéMON BREEDER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246831:: @ 8246831 - .string "I'm raising a couple good ones!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "How about it?\n" - .string "Feel like making a tag team with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7:: @ 82468A7 - .string "Thank you kindly!\p" - .string "I'll go take care of the registration\n" - .string "stuff, so you wait right here!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE - .string "I was looking forward to being\n" - .string "your partner…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B:: @ 824692B - .string "Well, hello!\n" - .string "I'm TRIATHLETE {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B:: @ 824694B - .string "Want to know what I run with?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C:: @ 824697C - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Well?\n" - .string "Want to be in a tag team with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4:: @ 82469B4 - .string "Good going!\p" - .string "I'll be quick and get the registration\n" - .string "all done!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1:: @ 82469F1 - .string "You and me, we would've been tops.\n" - .string "It's too bad…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22:: @ 8246A22 - .string "Hey, there! My name's {STR_VAR_1}!\n" - .string "I'm a TRIATHLETE!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E:: @ 8246A4E - .string "I go on runs with my durable team--\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85:: @ 8246A85 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Not too shabby, huh?\n" - .string "We should be in a tag team together!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF:: @ 8246ACF - .string "All right!\n" - .string "I'll go register in a flash!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7:: @ 8246AF7 - .string "I really wanted to battle as your\n" - .string "tag-team partner…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B:: @ 8246B2B - .string "I'm BATTLE GIRL {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F:: @ 8246B3F - .string "I've been toughening up one\n" - .string "{STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B - .string "one {STR_VAR_1}-using {STR_VAR_2}!\p" - .string "Do you like that combo?\n" - .string "How about you and me join up?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2:: @ 8246BB2 - .string "Why, thanks!\p" - .string "I'll get the registration done\n" - .string "right now!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9 - .string "With you, I thought we could form\n" - .string "the ultimate tag team…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22:: @ 8246C22 - .string "I'm TRIATHLETE {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35:: @ 8246C35 - .string "I've been running with one {STR_VAR_2}\n" - .string "that knows how to use {STR_VAR_1}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C:: @ 8246C6C - .string "and one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "We could be in a tag team.\n" - .string "Wouldn't that be great?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3:: @ 8246CB3 - .string "Thank you!\p" - .string "I'll go register us, and that's\n" - .string "right now!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9:: @ 8246CE9 - .string "Aww, that's too bad. We would've been\n" - .string "the toughest tag team around!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D:: @ 8246D2D - .string "Me?\n" - .string "I'm TUBER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F - .string "What do I have with me?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A:: @ 8246D6A - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Hey?\n" - .string "You'll team up with me, right?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E:: @ 8246D9E - .string "Okay!\p" - .string "I'll go register!\n" - .string "Let's be excellent together!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3:: @ 8246DD3 - .string "My POKéMON are tough for sure…\n" - .string "It's too bad you don't want to team up.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A:: @ 8246E1A - .string "Yay-hey!\n" - .string "Call me GUITARIST {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39:: @ 8246E39 - .string "Check out my entourage!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64:: @ 8246E64 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Yay-hey! Pretty wild, huh?\n" - .string "We'll have to do a duet in a tag team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6:: @ 8246EB6 - .string "Yay-hey! Right on!\n" - .string "I'll do that registration stuff now!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE:: @ 8246EEE - .string "My POKéMON rock hard!\n" - .string "You'll be sorry, I tell you!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21:: @ 8246F21 - .string "Pleased to meet you.\n" - .string "I am {STR_VAR_1}, a GENTLEMAN.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C:: @ 8246F4C - .string "I am accompanied by my trusted\n" - .string "{STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B:: @ 8246F7B - .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" - .string "May I ask you to join me in a tag-team\n" - .string "partnership arrangement?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC:: @ 8246FCC - .string "Ah, I thank you for your trust.\n" - .string "I shall be done with the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247013:: @ 8247013 - .string "That is most unfortunate…\p" - .string "I shall look forward to the next\n" - .string "opportunity…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B:: @ 824705B - .string "Hello, I'm {STR_VAR_1},\n" - .string "and I'm a POKéFAN.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D - .string "I have with me now one {STR_VAR_2}\n" - .string "that knows the move {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2:: @ 82470B2 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Do you like what you see?\n" - .string "Why don't you be my tag partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD:: @ 82470FD - .string "Thank you!\n" - .string "I'll look after the registration!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A:: @ 824712A - .string "My POKéMON are top grade…\n" - .string "It's too bad you can't appreciate that.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C:: @ 824716C - .string "Hm!\n" - .string "I am {STR_VAR_1}, and an EXPERT am I!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D:: @ 824718D - .string "The POKéMON that I've toughened up are\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7:: @ 82471C7 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "What say you to a tag team with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB:: @ 82471FB - .string "Hm!\n" - .string "I shall register us right away!\l" - .string "Let us both do our best!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247238:: @ 8247238 - .string "I will hope that your choice is\n" - .string "indeed correct…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247268:: @ 8247268 - .string "Hello, hello.\n" - .string "I'm {STR_VAR_1}, and I'm an EXPERT.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247291:: @ 8247291 - .string "I've raised my POKéMON thoroughly.\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7:: @ 82472C7 - .string "one {STR_VAR_2} with {STR_VAR_1}--\n" - .string "they're what I have.\p" - .string "Wouldn't you like to team up with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247313:: @ 8247313 - .string "Good, good.\n" - .string "I'll see to the registration right away.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247348:: @ 8247348 - .string "Perhaps we can form a team the next\n" - .string "time we meet.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A:: @ 824737A - .string "I'm DRAGON TAMER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F:: @ 824738F - .string "The team I've been toughening up is\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "How about it?\n" - .string "Want to be my partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB:: @ 82473FB - .string "Okay, I'll give it my best!\n" - .string "I'll go register now, all right?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247438:: @ 8247438 - .string "You're not going to find many tougher\n" - .string "partners than me!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247470:: @ 8247470 - .string "I'm BIRD KEEPER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484 - .string "What POKéMON do I have?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF:: @ 82474AF - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Don't you think we'd make a decent\n" - .string "tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC:: @ 82474EC - .string "Great, thanks!\n" - .string "I'll look after the registration!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D:: @ 824751D - .string "My POKéMON and I are strong.\n" - .string "What a letdown.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A:: @ 824754A - .string "I'm NINJA BOY {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C - .string "My POKéMON team consists of one\n" - .string "{STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B:: @ 824758B - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Let's be in a tag team together!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC:: @ 82475BC - .string "Yay!\n" - .string "Let me go register!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5:: @ 82475D5 - .string "You'll regret not having my tough\n" - .string "POKéMON on your side!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D:: @ 824760D - .string "Hello!\n" - .string "I'm PARASOL LADY {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629 - .string "Escorting me now are my {STR_VAR_2}\n" - .string "that uses {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247655:: @ 8247655 - .string "one {STR_VAR_2} that uses\n" - .string "{STR_VAR_1}.\p" - .string "Aren't they nice?\n" - .string "Care to join us in a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B:: @ 824769B - .string "Thanks a bunch!\p" - .string "I'll go register at the counter.\n" - .string "Let's not disappoint each other!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED - .string "My POKéMON are tremendously strong.\n" - .string "How disappointing…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247724:: @ 8247724 - .string "Hello.\n" - .string "I'm {STR_VAR_1}, and I'm a BUG MANIAC!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247749:: @ 8247749 - .string "I have found my POKéMON, yes.\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A:: @ 824777A - .string "one {STR_VAR_2} with {STR_VAR_1}--\n" - .string "they are what I found.\p" - .string "Could I interest you in forming\n" - .string "a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE:: @ 82477CE - .string "Okay!\n" - .string "Understood!\p" - .string "I won't be long with the registration!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247807:: @ 8247807 - .string "With the POKéMON I found, we wouldn't\n" - .string "have lost…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247838:: @ 8247838 - .string "Ahoy, there!\n" - .string "I'm SAILOR {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854 - .string "Let me show you my pride and joy!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247889:: @ 8247889 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Of course you're not going to turn\n" - .string "me down. We will team up, right?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD:: @ 82478DD - .string "I didn't expect any less!\n" - .string "I'll go register now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D:: @ 824790D - .string "We would've stormed through\n" - .string "the opposition! Too bad!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247942:: @ 8247942 - .string "Hi, I'm {STR_VAR_1}.\n" - .string "I'm a COLLECTOR.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F:: @ 824795F - .string "The jewels in my collection are\n" - .string "my {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247991:: @ 8247991 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Swell, huh?\n" - .string "We should be in a team together.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE:: @ 82479CE - .string "Oh, yeah!\p" - .string "Well, let's not waste any time.\n" - .string "I'll go register the two of us.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18:: @ 8247A18 - .string "Well, that's upsetting.\n" - .string "You don't appreciate my POKéMON.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51:: @ 8247A51 - .string "Howdy, I'm {STR_VAR_1}.\n" - .string "I'm a POKéMON RANGER.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76 - .string "Keeping me company are one\n" - .string "{STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1:: @ 8247AA1 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Don't you think we'd make an impressive\n" - .string "tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3:: @ 8247AE3 - .string "That's super!\n" - .string "I'll deal with the registration now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16:: @ 8247B16 - .string "Next time, choose my POKéMON,\n" - .string "will you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E:: @ 8247B3E - .string "My name's {STR_VAR_1}.\n" - .string "I'm a POKéMON RANGER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62:: @ 8247B62 - .string "Let me tell you about my team. I have\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B:: @ 8247B9B - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "How would you like to form a tag team\n" - .string "with my little posse?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7:: @ 8247BE7 - .string "We'll be at our best!\n" - .string "I'll get the registration done quick!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23:: @ 8247C23 - .string "I hope you'll choose my POKéMON\n" - .string "next time.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E:: @ 8247C4E - .string "Pleased to meet you. I'm {STR_VAR_1}.\n" - .string "I consider myself an AROMA LADY.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C:: @ 8247C8C - .string "I travel with one {STR_VAR_2}\n" - .string "that uses {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2:: @ 8247CB2 - .string "one {STR_VAR_2} that uses\n" - .string "{STR_VAR_1}.\p" - .string "I hope they strike your fancy.\n" - .string "Would you care to be my partner?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07:: @ 8247D07 - .string "I'm honored by your acceptance.\n" - .string "I will go register right this instant.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E - .string "It would be wonderful if we could form\n" - .string "a tag team the next time we meet.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97:: @ 8247D97 - .string "Want to know who I am?\n" - .string "I'm {STR_VAR_1}, the RUIN MANIAC!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7:: @ 8247DC7 - .string "The POKéMON that I have with me are\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE:: @ 8247DFE - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Intriguing, eh?\n" - .string "How about you and I partner up?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E:: @ 8247E3E - .string "That's a sound decision!\n" - .string "I'll go do the registration paperwork.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E:: @ 8247E7E - .string "Hmm…\n" - .string "I think my POKéMON are tough…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1:: @ 8247EA1 - .string "I'm COOLTRAINER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5 - .string "The POKéMON I have right now are one\n" - .string "{STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9:: @ 8247EE9 - .string "one {STR_VAR_2} with {STR_VAR_1}.\n" - .string "Cool, huh?\p" - .string "Don't you think it'd be pretty cool\n" - .string "if we made a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F:: @ 8247F3F - .string "Cool!\n" - .string "I'll go do the registration in a flash!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D:: @ 8247F6D - .string "I thought that we'd make just\n" - .string "the greatest team ever.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3:: @ 8247FA3 - .string "I'm COOLTRAINER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7:: @ 8247FB7 - .string "The team I've been raising has one\n" - .string "{STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Does that sound okay?\n" - .string "How about we become tag partners?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248031:: @ 8248031 - .string "Sounds A-OK!\n" - .string "I'd better do the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E - .string "I was thinking how we would be\n" - .string "one tough team…$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D:: @ 824808D - .string "Heyo!\n" - .string "I'm {STR_VAR_1}, the POKéMANIAC!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB - .string "What does a guy like me have?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC:: @ 82480DC - .string "one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that's what!\p" - .string "Let's do it!\n" - .string "We'll stomp around as a tag team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248128:: @ 8248128 - .string "Good call!\n" - .string "I'll register the both of us!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248151:: @ 8248151 - .string "My POKéMON are brutal!\n" - .string "It's not my fault if you regret this!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E:: @ 824818E - .string "Yo, there!\n" - .string "I'm KINDLER {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9:: @ 82481A9 - .string "You know what my training cooked up?\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1:: @ 82481E1 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Well, what do you say?\n" - .string "Want to form a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248221:: @ 8248221 - .string "All right!\n" - .string "I'll get on with the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F:: @ 824824F - .string "Promise you'll partner up with me\n" - .string "the next time we run into each other.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248297:: @ 8248297 - .string "I'm {STR_VAR_1}, and I'm a CAMPER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1:: @ 82482B1 - .string "I've been raising one {STR_VAR_1}-\n" - .string "using {STR_VAR_2} and one$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC:: @ 82482DC - .string "{STR_VAR_1}-using {STR_VAR_2}.\p" - .string "Do you think it'd be fun to team up?\n" - .string "I bet it would be!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248321:: @ 8248321 - .string "Yeah!\n" - .string "Off I go to register!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D:: @ 824833D - .string "Next time, okay?\n" - .string "I want to be on your team.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248369:: @ 8248369 - .string "Hello!\n" - .string "I'm {STR_VAR_1}, and I'm a PICNICKER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D:: @ 824838D - .string "The POKéMON I've been taking are\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1:: @ 82483C1 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Are you interested in joining me\n" - .string "on a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248401:: @ 8248401 - .string "Why, thank you!\n" - .string "I will do the registration now.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248431:: @ 8248431 - .string "It would be nice if I could join you\n" - .string "some other time.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248467:: @ 8248467 - .string "I'm PSYCHIC {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248477:: @ 8248477 - .string "The twosome I've been raising are\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Would you like to form a tag team\n" - .string "with me?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7:: @ 82484E7 - .string "Sure thing!\n" - .string "I'll take care of the registration!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248517:: @ 8248517 - .string "If we meet again, that's when I'd like\n" - .string "to team up with you.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248553:: @ 8248553 - .string "I'm {STR_VAR_1}.\n" - .string "I'm a PSYCHIC.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A:: @ 824856A - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D:: @ 824857D - .string "one {STR_VAR_2} with {STR_VAR_1}--\n" - .string "they're my disciples.\p" - .string "Doesn't the idea of forming a tag-team\n" - .string "partnership intrigue you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5:: @ 82485E5 - .string "Thank you.\n" - .string "I'll go deal with the registration.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248614:: @ 8248614 - .string "I hope there will be another chance\n" - .string "to forge an alliance.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E:: @ 824864E - .string "I'm SCHOOL KID {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248661:: @ 8248661 - .string "One {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248671:: @ 8248671 - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2} are my POKéMON pair.\p" - .string "May I please be your partner on\n" - .string "a tag team?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6:: @ 82486C6 - .string "Ooh, thank you!\n" - .string "I'll register at the counter right away!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF:: @ 82486FF - .string "Please?\n" - .string "May I join you the next time?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248725:: @ 8248725 - .string "Hiya! The name's {STR_VAR_1}!\n" - .string "I'm a POKéMON BREEDER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248751:: @ 8248751 - .string "The POKéMON I've raised are one\n" - .string "{STR_VAR_1}-using {STR_VAR_2} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248781:: @ 8248781 - .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" - .string "Sound interesting?\n" - .string "How about we form a tag team, then?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9:: @ 82487C9 - .string "All righty!\n" - .string "You leave the registration to me!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7:: @ 82487F7 - .string "You have to team up with me next time,\n" - .string "all right?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248829:: @ 8248829 - .string "I'm {STR_VAR_1}, and I'm proud to say\n" - .string "that I am a POKéFAN.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B:: @ 824885B - .string "The darling POKéMON I've raised are\n" - .string "one {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248892:: @ 8248892 - .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Aren't they just the cutest?\n" - .string "We ought to make a team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8:: @ 82488D8 - .string "Thank you, dear!\n" - .string "I'll be on my way to register!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248908:: @ 8248908 - .string "My darling POKéMON are the best,\n" - .string "I'll have you know. How annoying!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B:: @ 824894B - .string "Hi, I'm SWIMMER {STR_VAR_1}.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F:: @ 824895F - .string "One {STR_VAR_1}-using {STR_VAR_2}$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F:: @ 824896F - .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2} are what I've trained.\p" - .string "You and me, let's make a tag team.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD:: @ 82489BD - .string "That's cool!\n" - .string "I'll register the two of us.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7:: @ 82489E7 - .string "If we meet again, you owe me\n" - .string "a tag team!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10:: @ 8248A10 - .string "What's happening?\n" - .string "I'm {STR_VAR_1}, and I'm a TRIATHLETE.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40 - .string "I got a couple decent POKéMON.\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72:: @ 8248A72 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "It'd be neat if we made a tag team\n" - .string "together, so how about it?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0 - .string "Right on!\n" - .string "You wait while I register, okay?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB:: @ 8248AEB - .string "I expect you'll let me join you\n" - .string "next time, how's that?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22:: @ 8248B22 - .string "I'm the TRIATHLETE {STR_VAR_1}!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39:: @ 8248B39 - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C:: @ 8248B4C - .string "another {STR_VAR_2} that knows how\n" - .string "to use {STR_VAR_1}. That's my pair.\p" - .string "What do you think?\n" - .string "We'd make a good team, I'd say.$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4:: @ 8248BB4 - .string "I like that answer!\n" - .string "I'll get done with registration fast!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE:: @ 8248BEE - .string "You'll give me another chance to form\n" - .string "a partnership, won't you?$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E:: @ 8248C2E - .string "Hi, there! Hello!\n" - .string "I'm {STR_VAR_1}, and I'm a SWIMMER!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B:: @ 8248C5B - .string "Check out what I've been raising!\n" - .string "One {STR_VAR_2} with {STR_VAR_1} and$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90:: @ 8248C90 - .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Sweet, huh?\n" - .string "It'd be sweet to form a team, too!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF:: @ 8248CCF - .string "Much obliged!\n" - .string "I'll get this registration thing done!$" - -BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04:: @ 8248D04 - .string "If we meet again, you have to team up\n" - .string "with me. You'll do that, right?$" - +BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant: @ 8249524 + face_left + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle: @ 8249526 + walk_in_place_fastest_right + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter: @ 8249528 + walk_down + walk_down + walk_down + walk_down + face_left + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Enter: @ 824952E + walk_right + walk_down + walk_down + walk_down + face_left + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Exit: @ 8249534 + walk_up + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Exit: @ 8249539 + walk_up + walk_up + walk_up + walk_up + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer: @ 824953E + walk_right + walk_right + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantReturnToPos: @ 8249541 + walk_left + walk_left + walk_in_place_fastest_right + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft: @ 8249545 + walk_in_place_left + step_end + +BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet: @ 8249547 + .string "The 2nd set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet: @ 8249578 + .string "The 3rd set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet: @ 82495A9 + .string "The 4th set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet: @ 82495DA + .string "The 5th set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet: @ 824960B + .string "The 6th set of opponents is next.\n" + .string "Are you ready?$" + +BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet: @ 824963C + .string "The 7th set of opponents is next.\n" + .string "Are you ready?$" + +@ Unused +BattleFrontier_BattleTowerMultiBattleRoom_Text_2ndOpponentSetNext: @ 824966D + .string "The 2nd set of opponents is next.\n" + .string "Do your best!$" + +@ Unused +BattleFrontier_BattleTowerMultiBattleRoom_Text_3rdOpponentSetNext: @ 824969D + .string "The 3rd set of opponents is next.\n" + .string "Do your best!$" + +@ Unused +BattleFrontier_BattleTowerMultiBattleRoom_Text_4thOpponentSetNext: @ 82496CD + .string "The 4th set of opponents is next.\n" + .string "Do your best!$" + +@ Unused +BattleFrontier_BattleTowerMultiBattleRoom_Text_5thOpponentSetNext: @ 82496FD + .string "The 5th set of opponents is next.\n" + .string "Do your best!$" + +@ Unused +BattleFrontier_BattleTowerMultiBattleRoom_Text_6thOpponentSetNext: @ 824972D + .string "The 6th set of opponents is next.\n" + .string "Do your best!$" + +@ Unused +BattleFrontier_BattleTowerMultiBattleRoom_Text_7thOpponentSetNext: @ 824975D + .string "The 7th set of opponents is next.\n" + .string "Do your best!$" + +gText_LinkStandby3:: @ 824978D + .string "Link standby…$" + +gText_YourPartnerHasRetired:: @ 824979B + .string "Your partner has retired.\p" + .string "Your BATTLE ROOM challenge\n" + .string "will be canceled.$" diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json similarity index 90% rename from data/maps/BattleFrontier_BattleTowerCorridor2/map.json rename to data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json index 637d468fd7..ffc92b00ac 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", - "name": "BattleFrontier_BattleTowerCorridor2", - "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR", + "name": "BattleFrontier_BattleTowerMultiCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR", "music": "MUS_SATTOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, diff --git a/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc new file mode 100644 index 0000000000..532347ea93 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc @@ -0,0 +1,176 @@ +BattleFrontier_BattleTowerMultiCorridor_MapScripts:: @ 8248D4A + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiCorridor_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnFrame + .byte 0 + + @ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden + @ The player is represented instead by object event 1, which has the gfx id VAR_OBJ_GFX_ID_F + @ The multi partner is represented by object event 4, which has the gfx id VAR_OBJ_GFX_ID_E + +BattleFrontier_BattleTowerMultiCorridor_OnTransition: @ 8248D5A + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS + call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS + call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx + end + +BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx:: @ 8248D71 + tower_setpartnergfx + checkplayergender + compare VAR_RESULT, FEMALE + goto_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL + return + +BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale:: @ 8248D8B + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL + return + +BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx:: @ 8248D91 + special SetBattleTowerLinkPlayerGfx + return + +BattleFrontier_BattleTowerMultiCorridor_OnWarp: @ 8248D95 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects + .2byte 0 + +BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects:: @ 8248D9F + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR + hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR + special OffsetCameraForBattle + end + +BattleFrontier_BattleTowerMultiCorridor_OnFrame: @ 8248DB2 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor + .2byte 0 + +BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor:: @ 8248DBC + lockall + setflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR + setvar VAR_0x8004, 14 @ x coord of far door, used by DrawDoor + setvar VAR_0x8005, 1 @ y coord of far door, used by DrawDoor + opendoor 1, 1 + waitdooranim + clearflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR + showobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR + applymovement 1, BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator + applymovement 4, BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator + waitmovement 0 + setflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR + setvar VAR_0x8004, 14 @ x coord of far door, used by DrawDoor + setvar VAR_0x8005, 1 @ y coord of far door, used by DrawDoor + closedoor 1, 1 + waitdooranim + clearflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR + applymovement 1, BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor + applymovement 4, BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor + applymovement 3, BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor + applymovement 2, BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor + waitmovement 0 + delay 40 + applymovement 3, Common_Movement_WalkInPlaceFastestUp + applymovement 2, Common_Movement_WalkInPlaceFastestUp + waitmovement 0 + opendoor 7, 1 + waitdooranim + applymovement 3, BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor + applymovement 2, BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor + applymovement 1, BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor + applymovement 4, BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor + waitmovement 0 + closedoor 7, 1 + waitdooranim + delay 30 + setvar VAR_TEMP_1, 1 + call BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom + releaseall + end + +BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom:: @ 8248E71 + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES + call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES + call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS + call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom + compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS + call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom + return + +BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom:: @ 8248E9E + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 + waitstate + return + +BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom:: @ 8248EA8 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5 + waitstate + return + +@ Unnecessary duplicate of the above +BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom:: @ 8248EB2 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5 + waitstate + return + +BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor: @ 8248EBC + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + step_end + +BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor: @ 8248EC4 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + step_end + +BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor: @ 8248ECC + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_in_place_fastest_right + step_end + +BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor: @ 8248ED5 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_in_place_fastest_left + step_end + +BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor: @ 8248EDE + delay_16 + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor: @ 8248EE3 + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator: @ 8248EE6 + walk_down + step_end + diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json new file mode 100644 index 0000000000..89f7be3002 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM", + "name": "BattleFrontier_BattleTowerMultiPartnerRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJ_EVENT_GFX_TEALA", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_VAR_0", + "x": 2, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner1", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1" + }, + { + "graphics_id": "OBJ_EVENT_GFX_VAR_1", + "x": 17, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner2", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" + }, + { + "graphics_id": "OBJ_EVENT_GFX_VAR_2", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner3", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3" + }, + { + "graphics_id": "OBJ_EVENT_GFX_VAR_3", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner4", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4" + }, + { + "graphics_id": "OBJ_EVENT_GFX_VAR_4", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner5", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5" + }, + { + "graphics_id": "OBJ_EVENT_GFX_VAR_5", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner6", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6" + }, + { + "graphics_id": "OBJ_EVENT_GFX_VAR_6", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner7", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1" + }, + { + "graphics_id": "OBJ_EVENT_GFX_VAR_7", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner8", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc new file mode 100644 index 0000000000..77b9d1cd03 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc @@ -0,0 +1,1809 @@ +BattleFrontier_BattleTowerMultiPartnerRoom_MapScripts:: @ 8243D92 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerMultiPartnerRoom_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiPartnerRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame + .byte 0 + +BattleFrontier_BattleTowerMultiPartnerRoom_OnResume: @ 8243DA7 + pyramid_resetparty + end + +BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition: @ 8243DB0 + goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 + setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 + setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 + tower_loadpartners + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner:: @ 8243DDA + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_BOY_1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_3, 1 + setobjectxyperm 1, 10, 2 + end + +BattleFrontier_BattleTowerMultiPartnerRoom_OnWarp: @ 8243E14 + map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth + .2byte 0 + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth:: @ 8243E1E + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + end + +BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame: @ 8243E23 + map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom + map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom + .2byte 0 + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom:: @ 8243E35 + lockall + setvar VAR_TEMP_3, 0 + goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom:: @ 8243E41 + lockall + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom + waitmovement 0 + applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit + waitmovement 0 + copyobjectxytoperm 1 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + waitmovement 0 + msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner, MSGBOX_DEFAULT + special HealPlayerParty + setvar VAR_TEMP_1, 1 + releaseall + end + +BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom: @ 8243E75 + walk_down + step_end + +BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit: @ 8243E77 + walk_left + walk_in_place_fastest_down + step_end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant:: @ 8243E7A + lock + faceplayer + message BattleFrontier_BattleTowerMultiPartnerRoom_Text_QuitLookingForPartner + waitmessage + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 + compare VAR_RESULT, 0 + goto_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge + msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner2, MSGBOX_DEFAULT + release + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge:: @ 8243E9D + frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE + goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator:: @ 8243EB5 + msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_ThankYouForChoosingPartner, MSGBOX_DEFAULT + closemessage + applymovement 1, Common_Movement_WalkInPlaceFastestUp + waitmovement 0 + opendoor 10, 1 + waitdooranim + call BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator + closedoor 10, 1 + waitdooranim + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + waitstate + releaseall + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator:: @ 8243EE4 + applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator + waitmovement 0 + return + +@ Unused +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorEast: @ 8243EF6 + applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast + waitmovement 0 + return + +@ Unused +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorWest: @ 8243F08 + applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest + waitmovement 0 + return + +BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator: @ 8243F1A + walk_up + walk_up + set_invisible + step_end + +@ Functionally unused +BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast: @ 8243F1E + walk_right + walk_up + set_invisible + step_end + +@ Functionally unused +BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest: @ 8243F22 + walk_left + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator: @ 8243F26 + walk_up + set_invisible + step_end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner1:: @ 8243F29 + lock + faceplayer + setvar VAR_TEMP_2, 0 + goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner:: @ 8243F36 + goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_RejectPartner + tower_dopartnermsg PARTNER_MSGID_INTRO + waitmessage + waitbuttonpress + tower_dopartnermsg PARTNER_MSGID_MON1 + waitmessage + waitbuttonpress + tower_dopartnermsg PARTNER_MSGID_MON2_ASK + waitmessage + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 + switch VAR_RESULT + case 1, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_RejectPartner + case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_RejectPartner + tower_dopartnermsg PARTNER_MSGID_ACCEPT + waitmessage + waitbuttonpress + closemessage + compare VAR_FACING, DIR_SOUTH + call_if_ne BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit + compare VAR_FACING, DIR_SOUTH + call_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth + removeobject VAR_LAST_TALKED + setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER + warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 3 + waitstate + release + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_RejectPartner:: @ 8243FC3 + tower_dopartnermsg PARTNER_MSGID_REJECT + waitmessage + waitbuttonpress + release + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit:: @ 8243FD4 + applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExit + waitmovement 0 + return + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth:: @ 8243FDF + applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExitSouth + waitmovement 0 + return + +BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExit: @ 8243FEA + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + step_end + +BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExitSouth: @ 8243FF2 + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + step_end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner2:: @ 8243FFB + lock + faceplayer + setvar VAR_TEMP_2, 1 + goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner3:: @ 8244008 + lock + faceplayer + setvar VAR_TEMP_2, 2 + goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner4:: @ 8244015 + lock + faceplayer + setvar VAR_TEMP_2, 3 + goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner5:: @ 8244022 + lock + faceplayer + setvar VAR_TEMP_2, 4 + goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner6:: @ 824402F + lock + faceplayer + setvar VAR_TEMP_2, 5 + goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner7:: @ 824403C + lock + faceplayer + setvar VAR_TEMP_2, 6 + goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner + end + +BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner8:: @ 8244049 + lock + faceplayer + setvar VAR_TEMP_2, 7 + goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner + end + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner: @ 8244056 + .string "Please find a partner from out of\n" + .string "the TRAINERS gathered here.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_QuitLookingForPartner: @ 8244094 + .string "{PLAYER}, you have not found a partner\n" + .string "for your tag team.\p" + .string "Would you like to quit looking and\n" + .string "return to the reception counter?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner2: @ 824410C + .string "Then, please find a partner from\n" + .string "the TRAINERS gathered here.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ThankYouForChoosingPartner:: @ 8244149 + .string "Thank you for choosing a partner.\p" + .string "I will now show you to your\n" + .string "MULTI BATTLE ROOM.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Intro:: @ 824419A + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" + .string "You can call me {STR_VAR_3}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Mon1:: @ 82441CA + .string "On {STR_VAR_1}'s advice, I brought\n" + .string "one {STR_VAR_3} with {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Mon2Ask:: @ 82441F7 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Please, let me join you as a tag team.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Accept:: @ 824422E + .string "Thank you!\n" + .string "I'll go register right now.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Reject:: @ 8244255 + .string "I really wanted to form a tag team\n" + .string "with you, {PLAYER}…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Intro:: @ 8244286 + .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" + .string "My name is {STR_VAR_3}.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Mon1:: @ 82442B2 + .string "I got advice from {STR_VAR_1} and chose\n" + .string "one {STR_VAR_3} with {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Mon2Ask:: @ 82442E4 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Please, let's form a tag team!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Accept:: @ 8244313 + .string "Thank you very much!\n" + .string "I'll be done with registration quickly!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Reject:: @ 8244350 + .string "{PLAYER}, I was hoping that I could\n" + .string "partner up with you…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Intro:: @ 8244383 + .string "Um, my name's {STR_VAR_3}, and I'm\n" + .string "{STR_VAR_1}'s no. {STR_VAR_2} apprentice.\p" + .string "Snivel…\p" + .string "I'm sorry!\n" + .string "This tension is making me cry…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon1:: @ 82443E7 + .string "{STR_VAR_3} advised me, so I have\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon2Ask:: @ 8244413 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Snivel…\n" + .string "Please, please team up with me!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Accept:: @ 824444B + .string "Oh, really? You will?\n" + .string "Awesome! Wicked! Awoooh!\p" + .string "Oh… I'm sorry…\n" + .string "I'm so happy, I'm crying…\p" + .string "I'll go register right away.\n" + .string "Please don't go away!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Reject:: @ 82444D6 + .string "Oh, b-but…\n" + .string "Sob… Waaaaah!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Intro:: @ 82444EF + .string "Hi, there! I'm {STR_VAR_3}!\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon1:: @ 824451E + .string "{STR_VAR_3} recommended my crew.\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon2Ask:: @ 8244549 + .string "one {STR_VAR_2} with {STR_VAR_1},\n" + .string "that's what I have! Cool, huh?\p" + .string "So come on!\n" + .string "Let's form a tag team!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Accept:: @ 824459B + .string "Yay! Great!\n" + .string "Okay, I'll go register, okay?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Reject:: @ 82445C5 + .string "Aww, why?\n" + .string "I wanted to team up, {PLAYER}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Intro:: @ 82445E8 + .string "I'm {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n" + .string "of the famous {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon1:: @ 8244618 + .string "I looked to {STR_VAR_3} for advice.\n" + .string "One {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon2Ask:: @ 8244643 + .string "and one {STR_VAR_2} with {STR_VAR_1},\n" + .string "that's my pair.\p" + .string "Please, will you join me in\n" + .string "a tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Accept:: @ 824468F + .string "Thank you!\n" + .string "I'll register right away!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Reject:: @ 82446B4 + .string "{PLAYER}, I had been hoping to join\n" + .string "you in a tag team…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Intro:: @ 82446E5 + .string "Um… I'm sincerely happy that you\n" + .string "would take the time to talk to me.\p" + .string "I'm {STR_VAR_3}.\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon1:: @ 824474D + .string "{STR_VAR_3} gave me advice.\n" + .string "I'm very grateful for it.\p" + .string "I have a team of one {STR_VAR_2}\n" + .string "with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon2Ask:: @ 824479E + .string "one {STR_VAR_2} with {STR_VAR_1}.\n" + .string "I know I'm asking a lot…\p" + .string "I don't think you'll be willing to,\n" + .string "but may I join you as a partner?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Accept:: @ 824480C + .string "Really? I can't believe it!\n" + .string "I can't believe you'll let me join you!\l" + .string "I… I won't let you down!\p" + .string "Um… If it's really okay, I'll go register\n" + .string "right this instant!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Reject:: @ 82448A7 + .string "Oh…\n" + .string "I didn't think I was good enough…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Intro:: @ 82448CD + .string "Hi, I'm {STR_VAR_3}.\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon1:: @ 82448F5 + .string "{STR_VAR_3} told me that it would be\n" + .string "good to make this team:\l" + .string "one {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon2Ask:: @ 8244939 + .string "and one {STR_VAR_2} that knows how\n" + .string "to use {STR_VAR_1}.\p" + .string "Not bad, huh?\n" + .string "Want me to team up with you?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Accept:: @ 8244989 + .string "Okay, glad to join you!\n" + .string "I hope you won't mess things up for me!\l" + .string "I'll do my registration now.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Reject:: @ 82449E6 + .string "Huh? Why did you turn me down?\n" + .string "You're no judge of character!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Intro:: @ 8244A23 + .string "I'm {STR_VAR_3} and I'm a TRIATHLETE.\n" + .string "I'm busy every day what with jogging,\l" + .string "training, and rapping.\p" + .string "I also happen to be {STR_VAR_1}'s\n" + .string "no. {STR_VAR_2} apprentice.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon1:: @ 8244AA9 + .string "This is what {STR_VAR_3} recommended.\n" + .string "One {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon2Ask:: @ 8244AD6 + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2}.\p" + .string "I put a lot of effort into raising\n" + .string "them, even though I'm busy.\p" + .string "Let's form a tag team\n" + .string "and give it a go!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Accept:: @ 8244B52 + .string "Thanks, that's the spirit!\n" + .string "Hang tight while I go register, okay?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Reject:: @ 8244B93 + .string "I took time from my busy schedule\n" + .string "to be here! Give me a break!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Intro:: @ 8244BD2 + .string "Hi!\n" + .string "How's it going?\p" + .string "I'm {STR_VAR_3}, {STR_VAR_1}'s\n" + .string "no. {STR_VAR_2} apprentice. Glad to meet you!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon1:: @ 8244C18 + .string "Listen, listen! You have to hear about\n" + .string "the POKéMON {STR_VAR_3} recommended.\l" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon2Ask:: @ 8244C6E + .string "one {STR_VAR_2} with {STR_VAR_1}.\n" + .string "Of course I raised them superbly!\p" + .string "So, want to team up?\n" + .string "I'm sure it'll be a great combo!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Accept:: @ 8244CD6 + .string "Yay, I think this will be fun!\n" + .string "I'll go register!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Reject:: @ 8244D07 + .string "Oh, you're mean!\n" + .string "I come recommended, you know.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Intro:: @ 8244D36 + .string "Please let me introduce myself.\n" + .string "I am {STR_VAR_3}.\p" + .string "I serve as {STR_VAR_1}'s\n" + .string "no. {STR_VAR_2} apprentice.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon1:: @ 8244D82 + .string "I sought the sage advice of\n" + .string "{STR_VAR_3} and raised my team\l" + .string "of one {STR_VAR_2} with {STR_VAR_1}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon2Ask:: @ 8244DC6 + .string "and one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Please agree to a tag team with me!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Accept:: @ 8244DFE + .string "Oh… I'm delighted!\n" + .string "I promise to give you my best!\p" + .string "Of course I will register us!\n" + .string "Please wait!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Reject:: @ 8244E5B + .string "I had been hoping to join you,\n" + .string "{PLAYER}…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Intro:: @ 8244E7E + .string "Eek! You spoke to me!\n" + .string "I… I'm overjoyed!\p" + .string "I'm {STR_VAR_3}! I'm {STR_VAR_1}'s\n" + .string "no. {STR_VAR_2} apprentice!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon1:: @ 8244ECA + .string "On {STR_VAR_3}'s advice, I trained\n" + .string "one {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon2Ask:: @ 8244EF4 + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2}.\p" + .string "Please, can you grant me my wish?\n" + .string "I want to be your tag-team partner!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Accept:: @ 8244F4F + .string "Eek! I… I feel giddy!\n" + .string "Thank you so much!\l" + .string "I'll go register us right away!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Reject:: @ 8244F98 + .string "Waaah! Don't you feel any pity?\n" + .string "But that makes you cooler…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Intro:: @ 8244FD3 + .string "Yeehaw! I'm {STR_VAR_1}'s\n" + .string "no. {STR_VAR_2} apprentice!\p" + .string "{STR_VAR_3}'s my name, hello, hello!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon1:: @ 8245013 + .string "My mentor {STR_VAR_3} recommended\n" + .string "one {STR_VAR_1}-master {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon2Ask:: @ 824503D + .string "and one {STR_VAR_1}-master\n" + .string "{STR_VAR_2}.\p" + .string "Good stuff, huh?\n" + .string "You'll partner with me, won't you?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Accept:: @ 8245087 + .string "Okay, excellent!\n" + .string "I'll get the registration done quickly!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Reject:: @ 82450C0 + .string "Gwaaah!\n" + .string "You're a calculating one, {PLAYER}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Intro:: @ 82450E6 + .string "Hey! There's big trouble! This is\n" + .string "the BATTLE TOWER's last day!\p" + .string "… … … … … …\n" + .string "I'm only joking!\p" + .string "People call me {STR_VAR_3} and I do, too!\n" + .string "I'm {STR_VAR_1}'s 1,000th apprentice!\l" + .string "Actually, I'm no. {STR_VAR_2}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon1:: @ 8245196 + .string "{STR_VAR_3} gave me some advice.\n" + .string "{STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon2Ask:: @ 82451BD + .string "{STR_VAR_2} with {STR_VAR_1}.\n" + .string "I've got ten of each kind!\l" + .string "Actually, just one of each!\p" + .string "How about it?\n" + .string "Want to try tag battles with me?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Accept:: @ 824522F + .string "Yippee!\n" + .string "I'll give you a POKéMON as my thanks!\p" + .string "Just joking! But I will really go do\n" + .string "the registration, okay?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Reject:: @ 824529A + .string "Oh, that's so cold! I'll have to wreck\n" + .string "the BATTLE TOWER for that!\p" + .string "Of course I won't!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Intro:: @ 82452EF + .string "Hey, there, I'm rockin' and a-rollin'!\n" + .string "POKéMON, I be controllin'!\p" + .string "I'm {STR_VAR_3} the rappin' SAILOR.\n" + .string "Don't be mistakin' me for no wailer!\p" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" + .string "Me, you shouldn't be quick to dismiss!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon1:: @ 82453B4 + .string "With the advice of {STR_VAR_3} I did\n" + .string "abide, put together my team of pride!\l" + .string "One {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon2Ask:: @ 8245406 + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2}!\p" + .string "Our meeting we should commemorate,\n" + .string "with a tag-team victory to celebrate!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Accept:: @ 8245464 + .string "Hey, hey, I like your style!\n" + .string "Our registration, I will go file!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Reject:: @ 82454A3 + .string "Oh, hey, {PLAYER}, now that's cold!\n" + .string "If I may be so bold!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Intro:: @ 82454D6 + .string "Yippee-yahoo!\n" + .string "Oh, don't run! I was just having fun!\p" + .string "Howdy! I'm {STR_VAR_3}!\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon1:: @ 8245535 + .string "{STR_VAR_3} told me what to do.\n" + .string "So one {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon2Ask:: @ 824555F + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2}, I did choose.\p" + .string "So, what do you say?\n" + .string "Come on, make my day!\p" + .string "Please, I'm begging you!\n" + .string "Let me join you, don't leave me blue!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Accept:: @ 82455EC + .string "Yeahah! Luck is with me!\n" + .string "It sure makes me happy!\p" + .string "Before we go join the fray,\n" + .string "I'll go register right away!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Reject:: @ 8245656 + .string "You're turning me down?\n" + .string "{PLAYER}, you're making me frown!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Intro:: @ 824568A + .string "Cough!\p" + .string "Oh, sorry, I have a cold.\n" + .string "My POKéMON are fine, though.\p" + .string "My name's {STR_VAR_3}, {STR_VAR_1}'s\n" + .string "no. {STR_VAR_2} apprentice. Cough!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon1:: @ 82456F5 + .string "I took {STR_VAR_3}'s advice to heart\n" + .string "and put together my team of\l" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon2Ask:: @ 8245740 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "I trained them every day,\n" + .string "even in wind and rain.\p" + .string "That's why I have this cold,\n" + .string "I think.\p" + .string "That's what I'm about.\n" + .string "Want to be my tag partner?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Accept:: @ 82457D9 + .string "Thanks, I appreciate this!\n" + .string "Cough, cough!\l" + .string "Hang on while I go register.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Reject:: @ 824581F + .string "Oh, you won't?\n" + .string "{PLAYER}, I think we'd make a good pair.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Intro:: @ 8245851 + .string "Oh, hello!\n" + .string "This is nerve-racking.\p" + .string "I'm {STR_VAR_3}.\n" + .string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon1:: @ 824589C + .string "{STR_VAR_3} said this team'll be good--\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon2Ask:: @ 82458CE + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "I'm feeling self-conscious about this,\n" + .string "but will you let me join you?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Accept:: @ 8245923 + .string "Oh, gee, thank you!\n" + .string "I feel bashful, but I'll do my best!\p" + .string "I'll go get the registration done.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Reject:: @ 824597F + .string "Oh, please don't say no!\n" + .string "I feel self-conscious enough already…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Intro:: @ 82459BE + .string "I am {STR_VAR_3}, and that's no lie.\n" + .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon1:: @ 82459F7 + .string "{STR_VAR_3} recommended my team.\p" + .string "Since the advice sounded sincere,\n" + .string "I decided to bring with me\l" + .string "my {STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon2Ask:: @ 8245A5F + .string "my {STR_VAR_1}-using {STR_VAR_2}.\p" + .string "If possible, I would like you to accept\n" + .string "me as your tag-team partner.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Accept:: @ 8245AB4 + .string "You really will accept me?\n" + .string "It would be too terrible otherwise.\p" + .string "But since you've agreed, this is fine.\n" + .string "I shall go register the both of us.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Reject:: @ 8245B3E + .string "Hm? Now why would you refuse?\n" + .string "Is this your idea of a joke?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassIntro:: @ 8245B79 + .string "I'm {STR_VAR_1}, and I'm a LASS!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon1:: @ 8245B91 + .string "What I have are one {STR_VAR_2}\n" + .string "that uses {STR_VAR_1} and one$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon2Ask:: @ 8245BBD + .string "{STR_VAR_2} that uses {STR_VAR_1}.\n" + .string "Those are what I have with me.\p" + .string "Will you be my partner?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassAccept:: @ 8245C05 + .string "Thank you!\n" + .string "I'll go do the registration!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassReject:: @ 8245C2D + .string "You don't want to be my partner?\n" + .string "You'll regret it later!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterIntro:: @ 8245C66 + .string "Hello!\p" + .string "I'm YOUNGSTER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon1:: @ 8245C7F + .string "Want to know what I have?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon2Ask:: @ 8245CAC + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "You'll be my tag-team partner,\n" + .string "won't you?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterAccept:: @ 8245CE6 + .string "Yay!\n" + .string "I'll go and register, okay?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterReject:: @ 8245D07 + .string "Aww! If you'd form a tag team with\n" + .string "my POKéMON, we'd be unstoppable!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerIntro:: @ 8245D4B + .string "Yahoo!\n" + .string "I'm HIKER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon1:: @ 8245D60 + .string "Know what I have with me?\n" + .string "My {STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon2Ask:: @ 8245D8D + .string "my {STR_VAR_1}-using {STR_VAR_2}!\p" + .string "Sounds good, eh?\n" + .string "Want to form a tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerAccept:: @ 8245DC7 + .string "Yahoo!\n" + .string "I'll go do the registering, then.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerReject:: @ 8245DF0 + .string "I would've liked to battle with you\n" + .string "at my side.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyIntro:: @ 8245E20 + .string "Hello!\n" + .string "I'm {STR_VAR_1}, and I'm a BEAUTY!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon1:: @ 8245E41 + .string "Do you know what I've been raising?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon2Ask:: @ 8245E78 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "What do you think?\n" + .string "Want to make a tag team together?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyAccept:: @ 8245EBD + .string "Wonderful!\n" + .string "I'll get the registration done now!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyReject:: @ 8245EEC + .string "How disappointing!\p" + .string "We two together--we would've been\n" + .string "the best!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanIntro:: @ 8245F2B + .string "Yo!\p" + .string "You know who I am?\n" + .string "I'm {STR_VAR_1} the FISHERMAN!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon1:: @ 8245F58 + .string "I've got with me a team of one\n" + .string "{STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon2Ask:: @ 8245F87 + .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" + .string "So, how about it?\n" + .string "Will you battle at my side?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanAccept:: @ 8245FC6 + .string "Good, good!\n" + .string "Leave it up to me!\p" + .string "I'll go and register us now.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanReject:: @ 8246002 + .string "We matched up perfectly, too…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyIntro:: @ 8246020 + .string "Glad to make your acquaintance.\n" + .string "I am {STR_VAR_1}, a LADY.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon1:: @ 8246051 + .string "I am accompanied by a team of\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon2Ask:: @ 8246082 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "I hope I meet your approval.\n" + .string "For I wish to have you as my partner.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyAccept:: @ 82460D5 + .string "I thank you sincerely.\n" + .string "I shall handle the registration.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyReject:: @ 824610D + .string "I'm sure that you will regret not\n" + .string "having me as your partner.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFIntro:: @ 824614A + .string "I'm TRIATHLETE {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon1:: @ 824615D + .string "What I have…\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon2Ask:: @ 824617D + .string "one {STR_VAR_2} with {STR_VAR_1}!\n" + .string "That's my pair!\p" + .string "Please?\n" + .string "Will you form a tag team with me?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFAccept:: @ 82461C7 + .string "Gee, thanks!\n" + .string "I'll go register at the counter.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFReject:: @ 82461F5 + .string "We two together, we would've been\n" + .string "tough for certain!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherIntro:: @ 824622A + .string "Hiya!\n" + .string "I'm BUG CATCHER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon1:: @ 8246244 + .string "Check out what I have!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon2Ask:: @ 824626E + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "So, listen!\n" + .string "Do you want to form a tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherAccept:: @ 82462AA + .string "Gotcha!\p" + .string "I'll go do the registration stuff\n" + .string "at the counter.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherReject:: @ 82462E4 + .string "Aww, my POKéMON are awesome.\n" + .string "I hope you won't regret this!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMIntro:: @ 824631F + .string "Good day!\n" + .string "I'm SCHOOL KID {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon1:: @ 824633C + .string "What I've been raising are one\n" + .string "{STR_VAR_2} that uses {STR_VAR_1}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon2Ask:: @ 824636B + .string "and one {STR_VAR_2} that uses\n" + .string "{STR_VAR_1}.\p" + .string "Not too bad, don't you think?\n" + .string "Would you care to form a tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMAccept:: @ 82463C5 + .string "Thank you very much!\n" + .string "I'll get done with the registration.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMReject:: @ 82463FF + .string "That's too bad…\p" + .string "I was hoping that I could learn\n" + .string "from you as your partner…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyIntro:: @ 8246449 + .string "Yo! Let me tell you who I am!\n" + .string "I'm RICH BOY {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon1:: @ 8246478 + .string "Guess what I got!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon2Ask:: @ 824649D + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "I'm willing to offer you the chance\n" + .string "to be in a tag team with me.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyAccept:: @ 82464EE + .string "Smart move!\p" + .string "I'll finish up the registration\n" + .string "process quick!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyReject:: @ 8246529 + .string "You'd turn me of all people down?\n" + .string "You'll regret that decision for sure!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltIntro:: @ 8246571 + .string "Hiyah!\n" + .string "I am BLACK BELT {STR_VAR_1}.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon1:: @ 824658C + .string "As my companions, I have\n" + .string "one {STR_VAR_2} using {STR_VAR_1}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon2Ask:: @ 82465B5 + .string "and one {STR_VAR_2} using\n" + .string "{STR_VAR_1}.\p" + .string "Please, grant me my wish!\n" + .string "Allow me to be your tag partner!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltAccept:: @ 8246605 + .string "Hiyah!\n" + .string "I will go register forthwith!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltReject:: @ 824662A + .string "I see… I hope for an opportunity\n" + .string "the next time we meet…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFIntro:: @ 8246662 + .string "Hi, there!\n" + .string "I'm {STR_VAR_1}, and I'm a TUBER!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon1:: @ 8246686 + .string "I'll tell you what I have.\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon2Ask:: @ 82466B4 + .string "one {STR_VAR_2} with {STR_VAR_1}!\n" + .string "May I please be on your tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFAccept:: @ 82466E6 + .string "Thank you!\n" + .string "I'll go register us now!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFReject:: @ 824670A + .string "If we'd become partners, we could\n" + .string "have been so strong!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacIntro:: @ 8246741 + .string "Greetings…\n" + .string "I am HEX MANIAC {STR_VAR_1}…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon1:: @ 8246760 + .string "I bear with me one {STR_VAR_1}-using\n" + .string "{STR_VAR_2} together with one$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon2Ask:: @ 8246791 + .string "{STR_VAR_1}-using {STR_VAR_2}…\p" + .string "I beseech you…\n" + .string "Join me in a tag team…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacAccept:: @ 82467C4 + .string "I thank you…\n" + .string "I shall register us…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacReject:: @ 82467E6 + .string "I so longed to join you…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMIntro:: @ 82467FF + .string "How do you do? I'm {STR_VAR_1},\n" + .string "and I'm a POKéMON BREEDER!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon1:: @ 8246831 + .string "I'm raising a couple good ones!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon2Ask:: @ 8246864 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "How about it?\n" + .string "Feel like making a tag team with me?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMAccept:: @ 82468A7 + .string "Thank you kindly!\p" + .string "I'll go take care of the registration\n" + .string "stuff, so you wait right here!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMReject:: @ 82468FE + .string "I was looking forward to being\n" + .string "your partner…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFIntro:: @ 824692B + .string "Well, hello!\n" + .string "I'm TRIATHLETE {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon1:: @ 824694B + .string "Want to know what I run with?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon2Ask:: @ 824697C + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Well?\n" + .string "Want to be in a tag team with me?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFAccept:: @ 82469B4 + .string "Good going!\p" + .string "I'll be quick and get the registration\n" + .string "all done!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFReject:: @ 82469F1 + .string "You and me, we would've been tops.\n" + .string "It's too bad…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMIntro:: @ 8246A22 + .string "Hey, there! My name's {STR_VAR_1}!\n" + .string "I'm a TRIATHLETE!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon1:: @ 8246A4E + .string "I go on runs with my durable team--\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon2Ask:: @ 8246A85 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Not too shabby, huh?\n" + .string "We should be in a tag team together!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMAccept:: @ 8246ACF + .string "All right!\n" + .string "I'll go register in a flash!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMReject:: @ 8246AF7 + .string "I really wanted to battle as your\n" + .string "tag-team partner…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlIntro:: @ 8246B2B + .string "I'm BATTLE GIRL {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon1:: @ 8246B3F + .string "I've been toughening up one\n" + .string "{STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon2Ask:: @ 8246B6B + .string "one {STR_VAR_1}-using {STR_VAR_2}!\p" + .string "Do you like that combo?\n" + .string "How about you and me join up?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlAccept:: @ 8246BB2 + .string "Why, thanks!\p" + .string "I'll get the registration done\n" + .string "right now!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlReject:: @ 8246BE9 + .string "With you, I thought we could form\n" + .string "the ultimate tag team…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMIntro:: @ 8246C22 + .string "I'm TRIATHLETE {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon1:: @ 8246C35 + .string "I've been running with one {STR_VAR_2}\n" + .string "that knows how to use {STR_VAR_1}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon2Ask:: @ 8246C6C + .string "and one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "We could be in a tag team.\n" + .string "Wouldn't that be great?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMAccept:: @ 8246CB3 + .string "Thank you!\p" + .string "I'll go register us, and that's\n" + .string "right now!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMReject:: @ 8246CE9 + .string "Aww, that's too bad. We would've been\n" + .string "the toughest tag team around!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMIntro:: @ 8246D2D + .string "Me?\n" + .string "I'm TUBER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon1:: @ 8246D3F + .string "What do I have with me?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon2Ask:: @ 8246D6A + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Hey?\n" + .string "You'll team up with me, right?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMAccept:: @ 8246D9E + .string "Okay!\p" + .string "I'll go register!\n" + .string "Let's be excellent together!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMReject:: @ 8246DD3 + .string "My POKéMON are tough for sure…\n" + .string "It's too bad you don't want to team up.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristIntro:: @ 8246E1A + .string "Yay-hey!\n" + .string "Call me GUITARIST {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon1:: @ 8246E39 + .string "Check out my entourage!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon2Ask:: @ 8246E64 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Yay-hey! Pretty wild, huh?\n" + .string "We'll have to do a duet in a tag team!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristAccept:: @ 8246EB6 + .string "Yay-hey! Right on!\n" + .string "I'll do that registration stuff now!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristReject:: @ 8246EEE + .string "My POKéMON rock hard!\n" + .string "You'll be sorry, I tell you!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanIntro:: @ 8246F21 + .string "Pleased to meet you.\n" + .string "I am {STR_VAR_1}, a GENTLEMAN.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon1:: @ 8246F4C + .string "I am accompanied by my trusted\n" + .string "{STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon2Ask:: @ 8246F7B + .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" + .string "May I ask you to join me in a tag-team\n" + .string "partnership arrangement?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanAccept:: @ 8246FCC + .string "Ah, I thank you for your trust.\n" + .string "I shall be done with the registration.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanReject:: @ 8247013 + .string "That is most unfortunate…\p" + .string "I shall look forward to the next\n" + .string "opportunity…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMIntro:: @ 824705B + .string "Hello, I'm {STR_VAR_1},\n" + .string "and I'm a POKéFAN.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon1:: @ 824707D + .string "I have with me now one {STR_VAR_2}\n" + .string "that knows the move {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon2Ask:: @ 82470B2 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Do you like what you see?\n" + .string "Why don't you be my tag partner?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMAccept:: @ 82470FD + .string "Thank you!\n" + .string "I'll look after the registration!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMReject:: @ 824712A + .string "My POKéMON are top grade…\n" + .string "It's too bad you can't appreciate that.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMIntro:: @ 824716C + .string "Hm!\n" + .string "I am {STR_VAR_1}, and an EXPERT am I!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon1:: @ 824718D + .string "The POKéMON that I've toughened up are\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon2Ask:: @ 82471C7 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "What say you to a tag team with me?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMAccept:: @ 82471FB + .string "Hm!\n" + .string "I shall register us right away!\l" + .string "Let us both do our best!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMReject:: @ 8247238 + .string "I will hope that your choice is\n" + .string "indeed correct…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFIntro:: @ 8247268 + .string "Hello, hello.\n" + .string "I'm {STR_VAR_1}, and I'm an EXPERT.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon1:: @ 8247291 + .string "I've raised my POKéMON thoroughly.\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon2Ask:: @ 82472C7 + .string "one {STR_VAR_2} with {STR_VAR_1}--\n" + .string "they're what I have.\p" + .string "Wouldn't you like to team up with me?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFAccept:: @ 8247313 + .string "Good, good.\n" + .string "I'll see to the registration right away.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFReject:: @ 8247348 + .string "Perhaps we can form a team the next\n" + .string "time we meet.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerIntro:: @ 824737A + .string "I'm DRAGON TAMER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon1:: @ 824738F + .string "The team I've been toughening up is\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon2Ask:: @ 82473C6 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "How about it?\n" + .string "Want to be my partner?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerAccept:: @ 82473FB + .string "Okay, I'll give it my best!\n" + .string "I'll go register now, all right?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerReject:: @ 8247438 + .string "You're not going to find many tougher\n" + .string "partners than me!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperIntro:: @ 8247470 + .string "I'm BIRD KEEPER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon1:: @ 8247484 + .string "What POKéMON do I have?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon2Ask:: @ 82474AF + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Don't you think we'd make a decent\n" + .string "tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperAccept:: @ 82474EC + .string "Great, thanks!\n" + .string "I'll look after the registration!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperReject:: @ 824751D + .string "My POKéMON and I are strong.\n" + .string "What a letdown.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro:: @ 824754A + .string "I'm NINJA BOY {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon1:: @ 824755C + .string "My POKéMON team consists of one\n" + .string "{STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon2Ask:: @ 824758B + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Let's be in a tag team together!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept:: @ 82475BC + .string "Yay!\n" + .string "Let me go register!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyReject:: @ 82475D5 + .string "You'll regret not having my tough\n" + .string "POKéMON on your side!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyIntro:: @ 824760D + .string "Hello!\n" + .string "I'm PARASOL LADY {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon1:: @ 8247629 + .string "Escorting me now are my {STR_VAR_2}\n" + .string "that uses {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon2Ask:: @ 8247655 + .string "one {STR_VAR_2} that uses\n" + .string "{STR_VAR_1}.\p" + .string "Aren't they nice?\n" + .string "Care to join us in a tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyAccept:: @ 824769B + .string "Thanks a bunch!\p" + .string "I'll go register at the counter.\n" + .string "Let's not disappoint each other!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyReject:: @ 82476ED + .string "My POKéMON are tremendously strong.\n" + .string "How disappointing…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacIntro:: @ 8247724 + .string "Hello.\n" + .string "I'm {STR_VAR_1}, and I'm a BUG MANIAC!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon1:: @ 8247749 + .string "I have found my POKéMON, yes.\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon2Ask:: @ 824777A + .string "one {STR_VAR_2} with {STR_VAR_1}--\n" + .string "they are what I found.\p" + .string "Could I interest you in forming\n" + .string "a tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept:: @ 82477CE + .string "Okay!\n" + .string "Understood!\p" + .string "I won't be long with the registration!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject:: @ 8247807 + .string "With the POKéMON I found, we wouldn't\n" + .string "have lost…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorIntro:: @ 8247838 + .string "Ahoy, there!\n" + .string "I'm SAILOR {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon1:: @ 8247854 + .string "Let me show you my pride and joy!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon2Ask:: @ 8247889 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Of course you're not going to turn\n" + .string "me down. We will team up, right?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorAccept:: @ 82478DD + .string "I didn't expect any less!\n" + .string "I'll go register now.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorReject:: @ 824790D + .string "We would've stormed through\n" + .string "the opposition! Too bad!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorIntro:: @ 8247942 + .string "Hi, I'm {STR_VAR_1}.\n" + .string "I'm a COLLECTOR.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon1:: @ 824795F + .string "The jewels in my collection are\n" + .string "my {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon2Ask:: @ 8247991 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Swell, huh?\n" + .string "We should be in a team together.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorAccept:: @ 82479CE + .string "Oh, yeah!\p" + .string "Well, let's not waste any time.\n" + .string "I'll go register the two of us.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorReject:: @ 8247A18 + .string "Well, that's upsetting.\n" + .string "You don't appreciate my POKéMON.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMIntro:: @ 8247A51 + .string "Howdy, I'm {STR_VAR_1}.\n" + .string "I'm a POKéMON RANGER.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon1:: @ 8247A76 + .string "Keeping me company are one\n" + .string "{STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask:: @ 8247AA1 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Don't you think we'd make an impressive\n" + .string "tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMAccept:: @ 8247AE3 + .string "That's super!\n" + .string "I'll deal with the registration now.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMReject:: @ 8247B16 + .string "Next time, choose my POKéMON,\n" + .string "will you?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFIntro:: @ 8247B3E + .string "My name's {STR_VAR_1}.\n" + .string "I'm a POKéMON RANGER!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon1:: @ 8247B62 + .string "Let me tell you about my team. I have\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon2Ask:: @ 8247B9B + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "How would you like to form a tag team\n" + .string "with my little posse?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept:: @ 8247BE7 + .string "We'll be at our best!\n" + .string "I'll get the registration done quick!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFReject:: @ 8247C23 + .string "I hope you'll choose my POKéMON\n" + .string "next time.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyIntro:: @ 8247C4E + .string "Pleased to meet you. I'm {STR_VAR_1}.\n" + .string "I consider myself an AROMA LADY.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon1:: @ 8247C8C + .string "I travel with one {STR_VAR_2}\n" + .string "that uses {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon2Ask:: @ 8247CB2 + .string "one {STR_VAR_2} that uses\n" + .string "{STR_VAR_1}.\p" + .string "I hope they strike your fancy.\n" + .string "Would you care to be my partner?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyAccept:: @ 8247D07 + .string "I'm honored by your acceptance.\n" + .string "I will go register right this instant.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyReject:: @ 8247D4E + .string "It would be wonderful if we could form\n" + .string "a tag team the next time we meet.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro:: @ 8247D97 + .string "Want to know who I am?\n" + .string "I'm {STR_VAR_1}, the RUIN MANIAC!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1:: @ 8247DC7 + .string "The POKéMON that I have with me are\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask:: @ 8247DFE + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Intriguing, eh?\n" + .string "How about you and I partner up?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept:: @ 8247E3E + .string "That's a sound decision!\n" + .string "I'll go do the registration paperwork.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacReject:: @ 8247E7E + .string "Hmm…\n" + .string "I think my POKéMON are tough…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro:: @ 8247EA1 + .string "I'm COOLTRAINER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon1:: @ 8247EB5 + .string "The POKéMON I have right now are one\n" + .string "{STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon2Ask:: @ 8247EE9 + .string "one {STR_VAR_2} with {STR_VAR_1}.\n" + .string "Cool, huh?\p" + .string "Don't you think it'd be pretty cool\n" + .string "if we made a tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMAccept:: @ 8247F3F + .string "Cool!\n" + .string "I'll go do the registration in a flash!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject:: @ 8247F6D + .string "I thought that we'd make just\n" + .string "the greatest team ever.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro:: @ 8247FA3 + .string "I'm COOLTRAINER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1:: @ 8247FB7 + .string "The team I've been raising has one\n" + .string "{STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon2Ask:: @ 8247FE9 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Does that sound okay?\n" + .string "How about we become tag partners?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFAccept:: @ 8248031 + .string "Sounds A-OK!\n" + .string "I'd better do the registration.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFReject:: @ 824805E + .string "I was thinking how we would be\n" + .string "one tough team…$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro:: @ 824808D + .string "Heyo!\n" + .string "I'm {STR_VAR_1}, the POKéMANIAC!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon1:: @ 82480AB + .string "What does a guy like me have?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon2Ask:: @ 82480DC + .string "one {STR_VAR_2} with {STR_VAR_1},\n" + .string "that's what!\p" + .string "Let's do it!\n" + .string "We'll stomp around as a tag team!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacAccept:: @ 8248128 + .string "Good call!\n" + .string "I'll register the both of us!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacReject:: @ 8248151 + .string "My POKéMON are brutal!\n" + .string "It's not my fault if you regret this!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerIntro:: @ 824818E + .string "Yo, there!\n" + .string "I'm KINDLER {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon1:: @ 82481A9 + .string "You know what my training cooked up?\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon2Ask:: @ 82481E1 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Well, what do you say?\n" + .string "Want to form a tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerAccept:: @ 8248221 + .string "All right!\n" + .string "I'll get on with the registration.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerReject:: @ 824824F + .string "Promise you'll partner up with me\n" + .string "the next time we run into each other.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperIntro:: @ 8248297 + .string "I'm {STR_VAR_1}, and I'm a CAMPER!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1:: @ 82482B1 + .string "I've been raising one {STR_VAR_1}-\n" + .string "using {STR_VAR_2} and one$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask:: @ 82482DC + .string "{STR_VAR_1}-using {STR_VAR_2}.\p" + .string "Do you think it'd be fun to team up?\n" + .string "I bet it would be!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept:: @ 8248321 + .string "Yeah!\n" + .string "Off I go to register!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject:: @ 824833D + .string "Next time, okay?\n" + .string "I want to be on your team.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro:: @ 8248369 + .string "Hello!\n" + .string "I'm {STR_VAR_1}, and I'm a PICNICKER!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1:: @ 824838D + .string "The POKéMON I've been taking are\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon2Ask:: @ 82483C1 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Are you interested in joining me\n" + .string "on a tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept:: @ 8248401 + .string "Why, thank you!\n" + .string "I will do the registration now.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerReject:: @ 8248431 + .string "It would be nice if I could join you\n" + .string "some other time.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro:: @ 8248467 + .string "I'm PSYCHIC {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon1:: @ 8248477 + .string "The twosome I've been raising are\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask:: @ 82484AC + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Would you like to form a tag team\n" + .string "with me?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMAccept:: @ 82484E7 + .string "Sure thing!\n" + .string "I'll take care of the registration!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject:: @ 8248517 + .string "If we meet again, that's when I'd like\n" + .string "to team up with you.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro:: @ 8248553 + .string "I'm {STR_VAR_1}.\n" + .string "I'm a PSYCHIC.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1:: @ 824856A + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon2Ask:: @ 824857D + .string "one {STR_VAR_2} with {STR_VAR_1}--\n" + .string "they're my disciples.\p" + .string "Doesn't the idea of forming a tag-team\n" + .string "partnership intrigue you?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept:: @ 82485E5 + .string "Thank you.\n" + .string "I'll go deal with the registration.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFReject:: @ 8248614 + .string "I hope there will be another chance\n" + .string "to forge an alliance.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFIntro:: @ 824864E + .string "I'm SCHOOL KID {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1:: @ 8248661 + .string "One {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask:: @ 8248671 + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2} are my POKéMON pair.\p" + .string "May I please be your partner on\n" + .string "a tag team?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFAccept:: @ 82486C6 + .string "Ooh, thank you!\n" + .string "I'll register at the counter right away!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFReject:: @ 82486FF + .string "Please?\n" + .string "May I join you the next time?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFIntro:: @ 8248725 + .string "Hiya! The name's {STR_VAR_1}!\n" + .string "I'm a POKéMON BREEDER!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon1:: @ 8248751 + .string "The POKéMON I've raised are one\n" + .string "{STR_VAR_1}-using {STR_VAR_2} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon2Ask:: @ 8248781 + .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" + .string "Sound interesting?\n" + .string "How about we form a tag team, then?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFAccept:: @ 82487C9 + .string "All righty!\n" + .string "You leave the registration to me!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFReject:: @ 82487F7 + .string "You have to team up with me next time,\n" + .string "all right?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFIntro:: @ 8248829 + .string "I'm {STR_VAR_1}, and I'm proud to say\n" + .string "that I am a POKéFAN.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon1:: @ 824885B + .string "The darling POKéMON I've raised are\n" + .string "one {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon2Ask:: @ 8248892 + .string "one {STR_VAR_2} with {STR_VAR_1}.\p" + .string "Aren't they just the cutest?\n" + .string "We ought to make a team!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFAccept:: @ 82488D8 + .string "Thank you, dear!\n" + .string "I'll be on my way to register!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject:: @ 8248908 + .string "My darling POKéMON are the best,\n" + .string "I'll have you know. How annoying!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFIntro:: @ 824894B + .string "Hi, I'm SWIMMER {STR_VAR_1}.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1:: @ 824895F + .string "One {STR_VAR_1}-using {STR_VAR_2}$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon2Ask:: @ 824896F + .string "and one {STR_VAR_1}-using\n" + .string "{STR_VAR_2} are what I've trained.\p" + .string "You and me, let's make a tag team.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFAccept:: @ 82489BD + .string "That's cool!\n" + .string "I'll register the two of us.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject:: @ 82489E7 + .string "If we meet again, you owe me\n" + .string "a tag team!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro:: @ 8248A10 + .string "What's happening?\n" + .string "I'm {STR_VAR_1}, and I'm a TRIATHLETE.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon1:: @ 8248A40 + .string "I got a couple decent POKéMON.\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon2Ask:: @ 8248A72 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "It'd be neat if we made a tag team\n" + .string "together, so how about it?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept:: @ 8248AC0 + .string "Right on!\n" + .string "You wait while I register, okay?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMReject:: @ 8248AEB + .string "I expect you'll let me join you\n" + .string "next time, how's that?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro:: @ 8248B22 + .string "I'm the TRIATHLETE {STR_VAR_1}!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1:: @ 8248B39 + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon2Ask:: @ 8248B4C + .string "another {STR_VAR_2} that knows how\n" + .string "to use {STR_VAR_1}. That's my pair.\p" + .string "What do you think?\n" + .string "We'd make a good team, I'd say.$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFAccept:: @ 8248BB4 + .string "I like that answer!\n" + .string "I'll get done with registration fast!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFReject:: @ 8248BEE + .string "You'll give me another chance to form\n" + .string "a partnership, won't you?$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMIntro:: @ 8248C2E + .string "Hi, there! Hello!\n" + .string "I'm {STR_VAR_1}, and I'm a SWIMMER!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon1:: @ 8248C5B + .string "Check out what I've been raising!\n" + .string "One {STR_VAR_2} with {STR_VAR_1} and$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask:: @ 8248C90 + .string "one {STR_VAR_2} with {STR_VAR_1}!\p" + .string "Sweet, huh?\n" + .string "It'd be sweet to form a team, too!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMAccept:: @ 8248CCF + .string "Much obliged!\n" + .string "I'll get this registration thing done!$" + +BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject:: @ 8248D04 + .string "If we meet again, you have to team up\n" + .string "with me. You'll do that, right?$" + diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index ce5b15480b..bd8c84625d 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -510,9 +510,9 @@ "SafariZone_Northeast", "SafariZone_Southeast", "BattleFrontier_OutsideEast", + "BattleFrontier_BattleTowerMultiPartnerRoom", + "BattleFrontier_BattleTowerMultiCorridor", "BattleFrontier_BattleTowerMultiBattleRoom", - "BattleFrontier_BattleTowerCorridor2", - "BattleFrontier_BattleTowerBattleRoom2", "BattleFrontier_BattleDomeLobby", "BattleFrontier_BattleDomeCorridor", "BattleFrontier_BattleDomePreBattleRoom", diff --git a/data/specials.inc b/data/specials.inc index d19673eb72..afc95e8563 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -513,7 +513,7 @@ gSpecials:: @ 81DBA64 def_special TurnOnTVScreen def_special sub_81D4A90 def_special ShouldDistributeEonTicket - def_special sub_813B568 + def_special LinkRetireStatusWithBattleTowerPartner def_special sub_813B534 def_special CallTrainerHillFunction def_special Script_DoRayquazaScene @ Listed twice diff --git a/graphics/event_objects/pics/effects/lavaridge_gym_warp.png b/graphics/event_objects/pics/effects/lavaridge_gym_warp.png deleted file mode 100644 index 26b8522003b3ad2b60747c3e1ac14c1e5ac1afc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^0YEIk!VDyf)1Q679Ib>_w!{^Z;ekJLNX^s^W?h zZt*#5+ci}FYTk9_$P9@uwnodt7e2B4)p34%vP0-Kajk@_v@UWHe;8; za>lOaHP+L(WKLX&Na|ycd??ek^@U5QvBx>9GoDi-P0WsQ6dEv;9G!Jhyr?TpGp!+w z!M8PXsm+X{jgbzwOt$gQ0$bq>Ivp8=48p?N{&S@XlMX z@zU3dWp6*cIAS{cDR20$mqo?=|9Zb{EvfxeAUXd*kfh^1gTBXMT<;I>^U^zJ^Wx)! qj1Nt6-|t@PpI;$2=fV57`eU-M)TR^`UfX{b6n>trelF{r5}E*O46U31 diff --git a/include/battle_pyramid_bag.h b/include/battle_pyramid_bag.h index e3d65ef90d..df111b939f 100644 --- a/include/battle_pyramid_bag.h +++ b/include/battle_pyramid_bag.h @@ -41,10 +41,10 @@ void sub_81C5924(void); void sub_81C59BC(void); void sub_81C4EFC(void); void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void)); -void sub_81C6714(u8 taskId); +void Task_CloseBattlePyramidBagMessage(u8 taskId); void TryStoreHeldItemsInPyramidBag(void); void ChooseItemsToTossFromPyramidBag(void); -void sub_81C5B14(u8 taskId); +void CloseBattlePyramidBagAndSetCallback(u8 taskId); void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId)); #endif // GUARD_BATTLE_PYRAMID_BAG_H diff --git a/include/constants/apprentice.h b/include/constants/apprentice.h index 63434a4fcf..f1bea5e8c5 100644 --- a/include/constants/apprentice.h +++ b/include/constants/apprentice.h @@ -6,6 +6,8 @@ #define NUM_WHICH_MON_QUESTIONS MULTI_PARTY_SIZE #define NUM_WHICH_MOVE_QUESTIONS 5 +// + 2 below is 1 each for the lead mon question and the win speech question +#define MAX_APPRENTICE_QUESTIONS NUM_WHICH_MON_QUESTIONS + NUM_WHICH_MOVE_QUESTIONS + 2 #define APPRENTICE_LVL_MODE_50 (FRONTIER_LVL_50 + 1) #define APPRENTICE_LVL_MODE_OPEN (FRONTIER_LVL_OPEN + 1) diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h index 6afd8a9491..b372c3ad5c 100644 --- a/include/constants/battle_tower.h +++ b/include/constants/battle_tower.h @@ -11,15 +11,31 @@ #define BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO 7 #define BATTLE_TOWER_FUNC_NOP 8 #define BATTLE_TOWER_FUNC_NOP2 9 -#define BATTLE_TOWER_FUNC_10 10 -#define BATTLE_TOWER_FUNC_11 11 -#define BATTLE_TOWER_FUNC_12 12 +#define BATTLE_TOWER_FUNC_LOAD_PARTNERS 10 +#define BATTLE_TOWER_FUNC_PARTNER_MSG 11 +#define BATTLE_TOWER_FUNC_LOAD_LINK_OPPONENTS 12 #define BATTLE_TOWER_FUNC_13 13 -#define BATTLE_TOWER_FUNC_14 14 +#define BATTLE_TOWER_FUNC_SET_PARTNER_GFX 14 #define BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA 15 #define TOWER_DATA_WIN_STREAK 1 #define TOWER_DATA_WIN_STREAK_ACTIVE 2 #define TOWER_DATA_LVL_MODE 3 +// IDs for the messages printed by potential partners in the Battle Tower Multi Partner Room +#define PARTNER_MSGID_INTRO 0 +#define PARTNER_MSGID_MON1 1 +#define PARTNER_MSGID_MON2_ASK 2 +#define PARTNER_MSGID_ACCEPT 3 +#define PARTNER_MSGID_REJECT 4 + +// IDs for communicating with the Link Multi partner +#define BATTLE_TOWER_LINK_CONTINUE 0 +#define BATTLE_TOWER_LINK_RETIRE 1 + +#define BATTLE_TOWER_LINKSTAT_CONTINUE 0 +#define BATTLE_TOWER_LINKSTAT_BOTH_RETIRE 1 +#define BATTLE_TOWER_LINKSTAT_PARTNER_RETIRE 2 +#define BATTLE_TOWER_LINKSTAT_PLAYER_RETIRE 3 + #endif //GUARD_CONSTANTS_BATTLE_TOWER_H diff --git a/include/constants/flags.h b/include/constants/flags.h index 96546d7ab0..be08996917 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1637,13 +1637,13 @@ #define DAILY_FLAGS_END FLAG_UNUSED_0x95F // Special Flags (Stored in EWRAM (gSpecialFlags), not in the SaveBlock) -#define SPECIAL_FLAGS_START 0x4000 -#define FLAG_HIDE_MAP_NAME_POPUP (SPECIAL_FLAGS_START + 0x0) -#define FLAG_DONT_TRANSITION_MUSIC (SPECIAL_FLAGS_START + 0x1) -#define FLAG_SPECIAL_FLAG_0x4002 (SPECIAL_FLAGS_START + 0x2) -#define FLAG_SPECIAL_FLAG_UNUSED_0x4003 (SPECIAL_FLAGS_START + 0x3) // Unused Flag -#define FLAG_STORING_ITEMS_IN_PYRAMID_BAG (SPECIAL_FLAGS_START + 0x4) +#define SPECIAL_FLAGS_START 0x4000 +#define FLAG_HIDE_MAP_NAME_POPUP (SPECIAL_FLAGS_START + 0x0) +#define FLAG_DONT_TRANSITION_MUSIC (SPECIAL_FLAGS_START + 0x1) +#define FLAG_ENABLE_MULTI_CORRIDOR_DOOR (SPECIAL_FLAGS_START + 0x2) +#define FLAG_SPECIAL_FLAG_UNUSED_0x4003 (SPECIAL_FLAGS_START + 0x3) // Unused Flag +#define FLAG_STORING_ITEMS_IN_PYRAMID_BAG (SPECIAL_FLAGS_START + 0x4) // FLAG_SPECIAL_FLAG_0x4005 - 0x407F also exist and are unused -#define SPECIAL_FLAGS_END (SPECIAL_FLAGS_START + 0x7F) +#define SPECIAL_FLAGS_END (SPECIAL_FLAGS_START + 0x7F) #endif // GUARD_CONSTANTS_FLAGS_H diff --git a/include/constants/frontier_util.h b/include/constants/frontier_util.h index d718091691..a310dbb2d5 100644 --- a/include/constants/frontier_util.h +++ b/include/constants/frontier_util.h @@ -42,7 +42,7 @@ #define FRONTIER_DATA_PAUSED 3 #define FRONTIER_DATA_SELECTED_MON_ORDER 4 #define FRONTIER_DATA_BATTLE_OUTCOME 5 -#define FRONTIER_DATA_6 6 +#define FRONTIER_DATA_RECORD_DISABLED 6 #define FRONTIER_DATA_HEARD_BRAIN_SPEECH 7 #define STREAK_TOWER_SINGLES_50 (1 << 0) diff --git a/include/constants/item_effects.h b/include/constants/item_effects.h index a5bb770355..49fcedc617 100644 --- a/include/constants/item_effects.h +++ b/include/constants/item_effects.h @@ -3,7 +3,7 @@ // field 0 masks #define ITEM0_X_ATTACK 0x0F -#define ITEM0_HIGH_CRIT 0x30 // For Dire Hit, works the same way as move Focus Energy. +#define ITEM0_DIRE_HIT 0x30 // Works the same way as the move Focus Energy. #define ITEM0_SACRED_ASH 0x40 #define ITEM0_INFATUATION 0x80 @@ -23,7 +23,7 @@ #define ITEM3_POISON 0x10 #define ITEM3_SLEEP 0x20 #define ITEM3_LEVEL_UP 0x40 -#define ITEM3_MIST 0x80 // For Guard Specs, works the same way as move Mist. +#define ITEM3_GUARD_SPEC 0x80 // Works the same way as the move Mist. #define ITEM3_STATUS_ALL (ITEM3_CONFUSION | ITEM3_PARALYSIS | ITEM3_FREEZE | ITEM3_BURN | ITEM3_POISON | ITEM3_SLEEP) diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 55715e3365..3e876f4993 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -390,8 +390,8 @@ #define LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM 387 #define LAYOUT_MIRAGE_TOWER_4F 388 #define LAYOUT_DESERT_UNDERPASS 389 -#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM 390 -#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 391 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM 390 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR 391 #define LAYOUT_ROUTE111_NO_MIRAGE_TOWER 392 #define LAYOUT_UNION_ROOM 393 #define LAYOUT_SAFARI_ZONE_NORTHEAST 394 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 75cb71da0e..17fe7ab533 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -461,95 +461,95 @@ #define MAP_UNION_ROOM (60 | (25 << 8)) // Map Group 26 -#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8)) -#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) -#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) -#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR (26 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL (37 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL (38 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS (39 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) -#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8)) -#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8)) -#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8)) -#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8)) -#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8)) -#define MAP_TRAINER_HILL_1F (61 | (26 << 8)) -#define MAP_TRAINER_HILL_2F (62 | (26 << 8)) -#define MAP_TRAINER_HILL_3F (63 | (26 << 8)) -#define MAP_TRAINER_HILL_4F (64 | (26 << 8)) -#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8)) -#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) -#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) -#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) -#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) -#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) -#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) -#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) -#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8)) +#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) +#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) +#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM (15 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR (16 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (17 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR (26 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL (37 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL (38 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS (39 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) +#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8)) +#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8)) +#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8)) +#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8)) +#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8)) +#define MAP_TRAINER_HILL_1F (61 | (26 << 8)) +#define MAP_TRAINER_HILL_2F (62 | (26 << 8)) +#define MAP_TRAINER_HILL_3F (63 | (26 << 8)) +#define MAP_TRAINER_HILL_4F (64 | (26 << 8)) +#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8)) +#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) +#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) +#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) +#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) +#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) +#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) +#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) +#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) // Map Group 27 #define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8)) diff --git a/include/event_scripts.h b/include/event_scripts.h index 9e47223bf4..c2716a214a 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -582,4 +582,9 @@ extern const u8 SecretBase_EventScript_ShrubUseSecretPower[]; // trainer hill extern const u8 TrainerHill_EventScript_TrainerBattle[]; +// Item Use +extern u8 BerryTree_EventScript_ItemUsePlantBerry[]; +extern u8 BerryTree_EventScript_ItemUseWailmerPail[]; +extern u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[]; + #endif // GUARD_EVENT_SCRIPTS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 00233bd201..a619c2feb8 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -63,5 +63,6 @@ bool32 sub_808D1B4(void); bool32 sub_808D1E8(void); void SetPlayerInvisibility(bool8 invisible); u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y); +void StartFishing(u8 taskId); #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/field_specials.h b/include/field_specials.h index 79fa89bb1d..faf71e9c08 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -7,7 +7,7 @@ extern u8 gBikeCollisions; u8 GetLeadMonIndex(void); u8 IsDestinationBoxFull(void); u16 GetPCBoxToSendMon(void); -bool8 InMultiBattleRoom(void); +bool8 InMultiPartnerRoom(void); void UpdateTrainerFansAfterLinkBattle(void); void IncrementBirthIslandRockStepCount(void); bool8 AbnormalWeatherHasExpired(void); diff --git a/include/fieldmap.h b/include/fieldmap.h index be5610a469..dc81d17665 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -42,7 +42,7 @@ void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout); void copy_map_tileset1_to_vram(const struct MapLayout *); void copy_map_tileset2_to_vram(const struct MapLayout *); struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *connection); -struct MapConnection *sub_8088A8C(s16 x, s16 y); +struct MapConnection *GetConnectionAtCoords(s16 x, s16 y); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 5b12568fd9..af2be9c77c 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -143,6 +143,16 @@ struct MapHeader /* 0x1B */ u8 battleType; }; +// Flags for gMapHeader.flags, as defined in the map_header_flags macro +#define MAP_ALLOW_BIKE (1 << 0) +#define MAP_ALLOW_ESCAPE_ROPE (1 << 1) +#define MAP_ALLOW_RUN (1 << 2) +#define MAP_SHOW_MAP_NAME (1 << 3) +#define UNUSED_MAP_FLAGS (1 << 4 | 1 << 5 | 1 << 6 | 1 << 7) + +#define SHOW_MAP_NAME_ENABLED ((gMapHeader.flags & (MAP_SHOW_MAP_NAME | UNUSED_MAP_FLAGS)) == MAP_SHOW_MAP_NAME) + + struct ObjectEvent { /*0x00*/ u32 active:1; diff --git a/include/global.h b/include/global.h index bc73b82fab..e721a93ba1 100644 --- a/include/global.h +++ b/include/global.h @@ -331,7 +331,7 @@ struct BattleFrontier /*0xCA8*/ u8 challengeStatus; /*0xCA9*/ u8 lvlMode:2; /*0xCA9*/ u8 challengePaused:1; - /*0xCA9*/ u8 field_CA9_b:1; + /*0xCA9*/ u8 disableRecordBattle:1; /*0xCA9*/ u8 unused_CA9_c:1; /*0xCA9*/ u8 unused_CA9_d:1; /*0xCA9*/ u8 unused_CA9_e:1; diff --git a/include/item_menu.h b/include/item_menu.h index 508f94815d..089bff6cf3 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -74,7 +74,7 @@ void QuizLadyOpenBagMenu(void); void ApprenticeOpenBagMenu(void); void sub_81AABB0(void); void SetInitialScrollAndCursorPositions(u8 pocketId); -void bag_menu_mail_related(void); +void CB2_ReturnToBagMenuPocket(void); void CB2_BagMenuFromStartMenu(void); u8 GetItemListPosition(u8 pocketId); bool8 UseRegisteredKeyItemOnField(void); @@ -84,9 +84,13 @@ void DoWallyTutorialBagMenu(void); void ResetBagScrollPositions(void); void ChooseBerrySetCallback(void (*callback)(void)); void CB2_ChooseBerry(void); -void unknown_ItemMenu_Confirm(u8 taskId); +void Task_FadeAndCloseBagMenu(u8 taskId); void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*); -void sub_81AB9A8(u8 pocketId); +void BagMenu_InitListsMenu(u8 taskId); +void UpdatePocketItemList(u8 pocketId); +void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u8 taskId)); +void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); + #endif //GUARD_item_menu_H diff --git a/include/item_use.h b/include/item_use.h index 5ce47a9bc3..0cb76e7d41 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -3,27 +3,13 @@ void ItemUseOutOfBattle_Mail(u8); void ItemUseOutOfBattle_Bike(u8); -void ItemUseOnFieldCB_Bike(u8); void ItemUseOutOfBattle_Rod(u8); -void ItemUseOnFieldCB_Rod(u8); void ItemUseOutOfBattle_Itemfinder(u8); -void ItemUseOnFieldCB_Itemfinder(u8); -void RunItemfinderResults(u8); -void ExitItemfinder(u8); -bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *, u8); -void sub_80C9720(u8); -void sub_80C9838(u8, s16, s16); -u8 GetPlayerDirectionTowardsHiddenItem(s16, s16); -void SetPlayerDirectionTowardsItem(u8); -void DisplayItemRespondingMessageAndExitItemfinder(u8); -void RotatePlayerAndExitItemfinder(u8); void ItemUseOutOfBattle_PokeblockCase(u8); void ItemUseOutOfBattle_CoinCase(u8); void ItemUseOutOfBattle_PowderJar(u8); void ItemUseOutOfBattle_SSTicket(u8); -void sub_80C9D00(u8); void ItemUseOutOfBattle_WailmerPail(u8); -void sub_80C9D74(u8); void ItemUseOutOfBattle_Medicine(u8); void ItemUseOutOfBattle_ReduceEV(u8); void ItemUseOutOfBattle_SacredAsh(u8); @@ -31,25 +17,21 @@ void ItemUseOutOfBattle_PPRecovery(u8); void ItemUseOutOfBattle_PPUp(u8); void ItemUseOutOfBattle_RareCandy(u8); void ItemUseOutOfBattle_TMHM(u8); -void sub_80C9EE4(u8); -void sub_80C9F10(u8); -void sub_80C9F80(u8); -void sub_80C9FC0(u8); void ItemUseOutOfBattle_Repel(u8); -void ItemUseOutOfBattle_BlackWhiteFlute(u8); -void task08_080A1C44(u8); -u8 CanUseEscapeRopeOnCurrMap(void); void ItemUseOutOfBattle_EscapeRope(u8); +void ItemUseOutOfBattle_BlackWhiteFlute(u8); void ItemUseOutOfBattle_EvolutionStone(u8); +void ItemUseOutOfBattle_Berry(u8); +void ItemUseOutOfBattle_EnigmaBerry(u8); +void ItemUseOutOfBattle_CannotUse(u8); void ItemUseInBattle_PokeBall(u8); void ItemUseInBattle_StatIncrease(u8); void ItemUseInBattle_Medicine(u8); void ItemUseInBattle_PPRecovery(u8); void ItemUseInBattle_Escape(u8); -void ItemUseOutOfBattle_EnigmaBerry(u8); void ItemUseInBattle_EnigmaBerry(u8); -void ItemUseOutOfBattle_CannotUse(u8); +void Task_UseDigEscapeRopeOnField(u8 taskId); +u8 CanUseEscapeRopeOnCurrMap(void); u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId); -void ItemUseOutOfBattle_Berry(u8); #endif // GUARD_ITEM_USE_H diff --git a/include/menu.h b/include/menu.h index c5cef202ce..56865bcd9d 100644 --- a/include/menu.h +++ b/include/menu.h @@ -28,7 +28,6 @@ void DrawDialogueFrame(u8 windowId, bool8 copyToVram); void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram); u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); -void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram); void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram); void DisplayYesNoMenuDefaultYes(void); diff --git a/include/pokemon.h b/include/pokemon.h index 316fbc2b3a..2e28ae0f55 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -342,7 +342,7 @@ bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e); bool8 HealStatusConditions(struct Pokemon *mon, u32 battlePartyId, u32 healMask, u8 battlerId); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); -u8 *sub_806CF78(u16 itemId); +u8 *UseStatIncreaseItem(u16 itemId); u8 GetNature(struct Pokemon *mon); u8 GetNatureFromPersonality(u32 personality); u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem); diff --git a/include/strings.h b/include/strings.h index f8d77c73e9..fe4e08eebf 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1373,336 +1373,336 @@ extern const u8 gText_LucyDefeatGold[]; extern const u8 gText_BrandonDefeatGold[]; // Battle Tower. -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248297[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247749[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246864[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248661[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246662[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248321[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244549[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246244[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244383[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247268[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244643[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247348[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244989[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248467[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248553[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246741[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245656[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248725[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244939[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247291[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248614[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248031[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245464[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247313[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247470[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246529[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247238[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247655[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245535[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247991[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246605[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246020[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246449[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246831[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247854[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246051[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248401[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248671[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247484[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247629[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244413[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248369[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248892[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247889[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248781[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246791[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246571[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248431[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247807[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246002[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247838[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248151[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247942[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248751[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247724[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248908[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244618[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245406[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248517[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245087[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248221[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245196[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245740[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248128[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247013[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248477[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245923[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248829[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245013[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246686[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247438[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246082[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245851[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246760[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246478[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Intro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Accept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Reject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFReject[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMIntro[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon1[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMAccept[]; +extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[]; // Battle Dome. extern const u8 gBattleDomeOpponentPotentialText1[]; @@ -2026,7 +2026,7 @@ extern const u8 gText_JustOnePkmn[]; // battle main extern const u8 gText_LinkStandby3[]; -extern const u8 gText_BattleRecordCouldntBeSaved[]; +extern const u8 BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved[]; extern const u8 gText_Poison[]; extern const u8 gText_Sleep[]; extern const u8 gText_Paralysis[]; diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 6ef3591502..32f9620b7d 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -787,9 +787,9 @@ static u8 GetAI_ItemType(u8 itemId, const u8 *itemEffect) // NOTE: should take u return AI_ITEM_HEAL_HP; else if (itemEffect[3] & ITEM3_STATUS_ALL) return AI_ITEM_CURE_CONDITION; - else if (itemEffect[0] & (ITEM0_HIGH_CRIT | ITEM0_X_ATTACK) || itemEffect[1] != 0 || itemEffect[2] != 0) + else if (itemEffect[0] & (ITEM0_DIRE_HIT | ITEM0_X_ATTACK) || itemEffect[1] != 0 || itemEffect[2] != 0) return AI_ITEM_X_STAT; - else if (itemEffect[3] & ITEM3_MIST) + else if (itemEffect[3] & ITEM3_GUARD_SPEC) return AI_ITEM_GUARD_SPECS; else return AI_ITEM_NOT_RECOGNIZABLE; @@ -907,7 +907,7 @@ static bool8 ShouldUseItem(void) *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x8; if (itemEffects[2] & ITEM2_X_ACCURACY) *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x20; - if (itemEffects[0] & ITEM0_HIGH_CRIT) + if (itemEffects[0] & ITEM0_DIRE_HIT) *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x80; shouldUse = TRUE; break; diff --git a/src/battle_arena.c b/src/battle_arena.c index 67f0cc90e1..42a967fc64 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -791,7 +791,7 @@ static void InitArenaChallenge(void) gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.challengePaused = FALSE; - gSaveBlock2Ptr->frontier.field_CA9_b = 0; + gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE; if (lvlMode != FRONTIER_LVL_50) isCurrent = gSaveBlock2Ptr->frontier.winStreakActiveFlags & STREAK_ARENA_OPEN; else diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index e888531cb8..6604fa142e 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1846,7 +1846,7 @@ static void LinkOpponentHandleCmd55(void) else gBattleOutcome = gBattleBufferA[gActiveBattler][1] ^ B_OUTCOME_DREW; - gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; + gSaveBlock2Ptr->frontier.disableRecordBattle = gBattleBufferA[gActiveBattler][2]; FadeOutMapMusic(5); BeginFastPaletteFade(3); LinkOpponentBufferExecCompleted(); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 1382e3a8be..ece4c24bc8 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1676,7 +1676,7 @@ static void LinkPartnerHandleCmd55(void) { sub_81851A8(&gBattleBufferA[gActiveBattler][4]); gBattleOutcome = gBattleBufferA[gActiveBattler][1]; - gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; + gSaveBlock2Ptr->frontier.disableRecordBattle = gBattleBufferA[gActiveBattler][2]; FadeOutMapMusic(5); BeginFastPaletteFade(3); LinkPartnerBufferExecCompleted(); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 0bd1ea3631..161df3b828 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -3093,7 +3093,7 @@ static void PlayerHandleCmd55(void) { sub_81851A8(&gBattleBufferA[gActiveBattler][4]); gBattleOutcome = gBattleBufferA[gActiveBattler][1]; - gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; + gSaveBlock2Ptr->frontier.disableRecordBattle = gBattleBufferA[gActiveBattler][2]; FadeOutMapMusic(5); BeginFastPaletteFade(3); PlayerBufferExecCompleted(); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index d0e76ab1b1..b411c12f67 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1509,8 +1509,8 @@ void BtlController_EmitCmd55(u8 bufferId, u8 battleOutcome) { sBattleBuffersTransferData[0] = CONTROLLER_55; sBattleBuffersTransferData[1] = battleOutcome; - sBattleBuffersTransferData[2] = gSaveBlock2Ptr->frontier.field_CA9_b; - sBattleBuffersTransferData[3] = gSaveBlock2Ptr->frontier.field_CA9_b; + sBattleBuffersTransferData[2] = gSaveBlock2Ptr->frontier.disableRecordBattle; + sBattleBuffersTransferData[3] = gSaveBlock2Ptr->frontier.disableRecordBattle; sBattleBuffersTransferData[5] = sBattleBuffersTransferData[4] = sub_81850DC(&sBattleBuffersTransferData[6]); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sBattleBuffersTransferData[4] + 6); } diff --git a/src/battle_dome.c b/src/battle_dome.c index 7ff83f328a..897269a304 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -2259,7 +2259,7 @@ static void InitDomeChallenge(void) gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.challengePaused = FALSE; - gSaveBlock2Ptr->frontier.field_CA9_b = 0; + gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE; if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode])) gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] = 0; diff --git a/src/battle_factory.c b/src/battle_factory.c index b412af2371..b7e43394ec 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -193,7 +193,7 @@ static void InitFactoryChallenge(void) gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.challengePaused = FALSE; - gSaveBlock2Ptr->frontier.field_CA9_b = 0; + gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE; if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode])) { gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] = 0; diff --git a/src/battle_main.c b/src/battle_main.c index 196053ad28..bcef3b286a 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -715,7 +715,7 @@ static void CB2_InitBattleInternal(void) } gMain.inBattle = TRUE; - gSaveBlock2Ptr->frontier.field_CA9_b = 0; + gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE; for (i = 0; i < PARTY_SIZE; i++) AdjustFriendship(&gPlayerParty[i], 3); @@ -2315,7 +2315,7 @@ static void sub_8038F34(void) for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++); - if (!gSaveBlock2Ptr->frontier.field_CA9_b && i == monsCount) + if (!gSaveBlock2Ptr->frontier.disableRecordBattle && i == monsCount) { if (FlagGet(FLAG_SYS_FRONTIER_PASS)) { @@ -2594,7 +2594,7 @@ static void sub_803939C(void) } else { - BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordCouldntBeSaved); + BattleStringExpandPlaceholdersToDisplayedString(BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved); BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattleCommunication[1] = 0x80; gBattleCommunication[MULTIUSE_STATE]++; @@ -5070,7 +5070,7 @@ static void HandleEndTurn_BattleLost(void) { gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle; gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN); - gSaveBlock2Ptr->frontier.field_CA9_b = 1; + gSaveBlock2Ptr->frontier.disableRecordBattle = TRUE; } else { @@ -5102,7 +5102,7 @@ static void HandleEndTurn_RanFromBattle(void) { gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited; gBattleOutcome = B_OUTCOME_FORFEITED; - gSaveBlock2Ptr->frontier.field_CA9_b = 1; + gSaveBlock2Ptr->frontier.disableRecordBattle = TRUE; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { @@ -5721,7 +5721,7 @@ static void HandleAction_Run(void) } gBattleOutcome |= B_OUTCOME_LINK_BATTLE_RAN; - gSaveBlock2Ptr->frontier.field_CA9_b = 1; + gSaveBlock2Ptr->frontier.disableRecordBattle = TRUE; } else { diff --git a/src/battle_palace.c b/src/battle_palace.c index b5da77e35d..56fd04c686 100644 --- a/src/battle_palace.c +++ b/src/battle_palace.c @@ -89,7 +89,7 @@ static void InitPalaceChallenge(void) gSaveBlock2Ptr->frontier.challengeStatus = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.challengePaused = FALSE; - gSaveBlock2Ptr->frontier.field_CA9_b = 0; + gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE; if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode])) gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] = 0; diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index bdd1b14621..7c650800b9 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -67,7 +67,7 @@ static void sub_81C700C(void); static void sub_81C6E98(void); static void sub_81C6F20(void); static void sub_81C6404(void); -static void sub_81C6E1C(void); +static void CloseBattlePyramidBagTextWindow(void); static bool8 sub_81C5238(void); static bool8 sub_81C5078(void); static void ShowItemImage(u16 itemId, u8 itemSpriteArrayId); @@ -809,7 +809,7 @@ static void sub_81C5AB8(u8 y, u8 arg1) PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1); } -void sub_81C5B14(u8 taskId) +void CloseBattlePyramidBagAndSetCallback(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = sub_81C5B4C; @@ -862,7 +862,7 @@ static void Task_HandlePyramidBagInput(u8 taskId) case LIST_CANCEL: PlaySE(SE_SELECT); gSpecialVar_ItemId = 0; - sub_81C5B14(taskId); + CloseBattlePyramidBagAndSetCallback(taskId); break; default: PlaySE(SE_SELECT); @@ -1043,7 +1043,7 @@ static void BagAction_UseOnField(u8 taskId) || ItemIsMail(gSpecialVar_ItemId) == TRUE) { sub_81C61A8(); - DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, sub_81C6714); + DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, Task_CloseBattlePyramidBagMessage); } else if (ItemId_GetFieldFunc(gSpecialVar_ItemId) != NULL) { @@ -1203,7 +1203,7 @@ static void BagAction_Give(u8 taskId) else if (!ItemId_GetImportance(gSpecialVar_ItemId)) { gPyramidBagResources->callback2 = CB2_ChooseMonToGiveItem; - sub_81C5B14(taskId); + CloseBattlePyramidBagAndSetCallback(taskId); } else { @@ -1223,15 +1223,15 @@ static void sub_81C66EC(u8 taskId) if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - sub_81C6714(taskId); + Task_CloseBattlePyramidBagMessage(taskId); } } -void sub_81C6714(u8 taskId) +void Task_CloseBattlePyramidBagMessage(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_81C6E1C(); + CloseBattlePyramidBagTextWindow(); PrintItemDescription(data[1]); sub_81C5A98(data[0], 0); SetTaskToMainPyramidBagInputHandler(taskId); @@ -1242,7 +1242,7 @@ static void sub_81C674C(u8 taskId) if (!itemid_80BF6D8_mail_related(gSpecialVar_ItemId)) DisplayItemMessageInBattlePyramid(taskId, gText_CantWriteMail, sub_81C66EC); else if (!ItemId_GetImportance(gSpecialVar_ItemId)) - sub_81C5B14(taskId); + CloseBattlePyramidBagAndSetCallback(taskId); else sub_81C66AC(taskId); } @@ -1462,7 +1462,7 @@ void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback schedule_bg_copy_tilemap_to_vram(1); } -static void sub_81C6E1C(void) +static void CloseBattlePyramidBagTextWindow(void) { ClearDialogWindowAndFrameToTransparent(2, FALSE); // This ClearWindowTilemap call is redundant, since ClearDialogWindowAndFrameToTransparent already calls it. diff --git a/src/battle_tower.c b/src/battle_tower.c index 20c10bc15f..8d0a32d163 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -23,6 +23,7 @@ #include "field_message_box.h" #include "tv.h" #include "battle_factory.h" +#include "constants/apprentice.h" #include "constants/battle_frontier.h" #include "constants/battle_tower.h" #include "constants/frontier_util.h" @@ -55,11 +56,11 @@ static void SaveTowerChallenge(void); static void GetOpponentIntroSpeech(void); static void nullsub_61(void); static void nullsub_116(void); -static void sub_81642A0(void); -static void sub_8164828(void); -static void sub_8164B74(void); +static void LoadMultiPartnerCandidatesData(void); +static void ShowPartnerCandidateMessage(void); +static void LoadLinkMultiOpponentsData(void); static void sub_8164DCC(void); -static void sub_8164DE4(void); +static void SetMultiPartnerGfx(void); static void SetTowerInterviewData(void); static void ValidateBattleTowerRecordChecksums(void); static void SaveCurrentWinStreak(void); @@ -344,676 +345,419 @@ static const u8 sRubyFacilityClassToEmerald[RS_FACILITY_CLASSES_COUNT - 2][2] = {RS_FACILITY_CLASS_SIS_AND_BRO, FACILITY_CLASS_SIS_AND_BRO}, }; -static const u8 *const gUnknown_085DCFD8[] = +#define PARTNER_TEXTS(name) \ + BattleFrontier_BattleTowerMultiPartnerRoom_Text_##name##Intro, \ + BattleFrontier_BattleTowerMultiPartnerRoom_Text_##name##Mon1, \ + BattleFrontier_BattleTowerMultiPartnerRoom_Text_##name##Mon2Ask, \ + BattleFrontier_BattleTowerMultiPartnerRoom_Text_##name##Accept, \ + BattleFrontier_BattleTowerMultiPartnerRoom_Text_##name##Reject + +static const u8 *const sPartnerApprenticeTexts1[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_244383, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244413, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6 + PARTNER_TEXTS(Apprentice1) }; -static const u8 *const gUnknown_085DCFEC[] = +static const u8 *const sPartnerApprenticeTexts2[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244549, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5 + PARTNER_TEXTS(Apprentice2) }; -static const u8 *const gUnknown_085DD000[] = +static const u8 *const sPartnerApprenticeTexts3[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244618, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244643, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4 + PARTNER_TEXTS(Apprentice3) }; -static const u8 *const gUnknown_085DD014[] = +static const u8 *const sPartnerApprenticeTexts4[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7 + PARTNER_TEXTS(Apprentice4) }; -static const u8 *const gUnknown_085DD028[] = +static const u8 *const sPartnerApprenticeTexts5[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244939, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244989, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6 + PARTNER_TEXTS(Apprentice5) }; -static const u8 *const gUnknown_085DD03C[] = +static const u8 *const sPartnerApprenticeTexts6[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93 + PARTNER_TEXTS(Apprentice6) }; -static const u8 *const gUnknown_085DD050[] = +static const u8 *const sPartnerApprenticeTexts7[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07 + PARTNER_TEXTS(Apprentice7) }; -static const u8 *const gUnknown_085DD064[] = +static const u8 *const sPartnerApprenticeTexts8[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B + PARTNER_TEXTS(Apprentice8) }; -static const u8 *const gUnknown_085DD078[] = +static const u8 *const sPartnerApprenticeTexts9[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98 + PARTNER_TEXTS(Apprentice9) }; -static const u8 *const gUnknown_085DD08C[] = +static const u8 *const sPartnerApprenticeTexts10[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245013, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245087, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0 + PARTNER_TEXTS(Apprentice10) }; -static const u8 *const gUnknown_085DD0A0[] = +static const u8 *const sPartnerApprenticeTexts11[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245196, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A + PARTNER_TEXTS(Apprentice11) }; -static const u8 *const gUnknown_085DD0B4[] = +static const u8 *const sPartnerApprenticeTexts12[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245406, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245464, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3 + PARTNER_TEXTS(Apprentice12) }; -static const u8 *const gUnknown_085DD0C8[] = +static const u8 *const sPartnerApprenticeTexts13[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245535, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245656 + PARTNER_TEXTS(Apprentice13) }; -static const u8 *const gUnknown_085DD0DC[] = +static const u8 *const sPartnerApprenticeTexts14[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245740, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F + PARTNER_TEXTS(Apprentice14) }; -static const u8 *const gUnknown_085DD0F0[] = +static const u8 *const sPartnerApprenticeTexts15[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_245851, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245923, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F + PARTNER_TEXTS(Apprentice15) }; -static const u8 *const gUnknown_085DD104[] = +static const u8 *const sPartnerApprenticeTexts16[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E + PARTNER_TEXTS(Apprentice16) }; -static const u8 *const gUnknown_085DD118[] = +static const u8 *const sPartnerTextsLass[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D + PARTNER_TEXTS(Lass) }; -static const u8 *const gUnknown_085DD12C[] = +static const u8 *const sPartnerTextsYoungster[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07 + PARTNER_TEXTS(Youngster) }; -static const u8 *const gUnknown_085DD140[] = +static const u8 *const sPartnerTextsHiker[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0 + PARTNER_TEXTS(Hiker) }; -static const u8 *const gUnknown_085DD154[] = +static const u8 *const sPartnerTextsBeauty[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC + PARTNER_TEXTS(Beauty) }; -static const u8 *const gUnknown_085DD168[] = +static const u8 *const sPartnerTextsFisherman[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87, - BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246002 + PARTNER_TEXTS(Fisherman) }; -static const u8 *const gUnknown_085DD17C[] = +static const u8 *const sPartnerTextsLady[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246020, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246051, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246082, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D + PARTNER_TEXTS(Lady) }; -static const u8 *const gUnknown_085DD190[] = +static const u8 *const sPartnerTextsCyclingTriathleteF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5 + PARTNER_TEXTS(CyclingTriathleteF) }; -static const u8 *const gUnknown_085DD1A4[] = +static const u8 *const sPartnerTextsBugCatcher[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246244, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4 + PARTNER_TEXTS(BugCatcher) }; -static const u8 *const gUnknown_085DD1B8[] = +static const u8 *const sPartnerTextsSchoolKidM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF + PARTNER_TEXTS(SchoolKidM) }; -static const u8 *const gUnknown_085DD1CC[] = +static const u8 *const sPartnerTextsRichBoy[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246449, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246478, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246529 + PARTNER_TEXTS(RichBoy) }; -static const u8 *const gUnknown_085DD1E0[] = +static const u8 *const sPartnerTextsBlackBelt[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246571, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246605, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A + PARTNER_TEXTS(BlackBelt) }; -static const u8 *const gUnknown_085DD1F4[] = +static const u8 *const sPartnerTextsTuberF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246662, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246686, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A + PARTNER_TEXTS(TuberF) }; -static const u8 *const gUnknown_085DD208[] = +static const u8 *const sPartnerTextsHexManiac[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246741, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246760, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246791, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6 + PARTNER_TEXTS(HexManiac) }; -static const u8 *const gUnknown_085DD21C[] = +static const u8 *const sPartnerTextsPkmnBreederM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246831, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246864, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE + PARTNER_TEXTS(PkmnBreederM) }; -static const u8 *const gUnknown_085DD230[] = +static const u8 *const sPartnerTextsRunningTriathleteF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1 + PARTNER_TEXTS(RunningTriathleteF) }; -static const u8 *const gUnknown_085DD244[] = +static const u8 *const sPartnerTextsRunningTriathleteM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7 + PARTNER_TEXTS(RunningTriathleteM) }; -static const u8 *const gUnknown_085DD258[] = +static const u8 *const sPartnerTextsBattleGirl[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9 + PARTNER_TEXTS(BattleGirl) }; -static const u8 *const gUnknown_085DD26C[] = +static const u8 *const sPartnerTextsCyclingTriathleteM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9 + PARTNER_TEXTS(CyclingTriathleteM) }; -static const u8 *const gUnknown_085DD280[] = +static const u8 *const sPartnerTextsTuberM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3 + PARTNER_TEXTS(TuberM) }; -static const u8 *const gUnknown_085DD294[] = +static const u8 *const sPartnerTextsGuitarist[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE + PARTNER_TEXTS(Guitarist) }; -static const u8 *const gUnknown_085DD2A8[] = +static const u8 *const sPartnerTextsGentleman[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247013 + PARTNER_TEXTS(Gentleman) }; -static const u8 *const gUnknown_085DD2BC[] = +static const u8 *const sPartnerTextsPokefanM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A + PARTNER_TEXTS(PokefanM) }; -static const u8 *const gUnknown_085DD2D0[] = +static const u8 *const sPartnerTextsExpertM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247238 + PARTNER_TEXTS(ExpertM) }; -static const u8 *const gUnknown_085DD2E4[] = +static const u8 *const sPartnerTextsExpertF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247268, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247291, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247313, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247348 + PARTNER_TEXTS(ExpertF) }; -static const u8 *const gUnknown_085DD2F8[] = +static const u8 *const sPartnerTextsDragonTamer[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247438 + PARTNER_TEXTS(DragonTamer) }; -static const u8 *const gUnknown_085DD30C[] = +static const u8 *const sPartnerTextsBirdKeeper[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247470, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247484, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D + PARTNER_TEXTS(BirdKeeper) }; -static const u8 *const gUnknown_085DD320[] = +static const u8 *const sPartnerTextsNinjaBoy[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5 + PARTNER_TEXTS(NinjaBoy) }; -static const u8 *const gUnknown_085DD334[] = +static const u8 *const sPartnerTextsParasolLady[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247629, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247655, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED + PARTNER_TEXTS(ParasolLady) }; -static const u8 *const gUnknown_085DD348[] = +static const u8 *const sPartnerTextsBugManiac[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247724, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247749, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247807 + PARTNER_TEXTS(BugManiac) }; -static const u8 *const gUnknown_085DD35C[] = +static const u8 *const sPartnerTextsSailor[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247838, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247854, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247889, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D + PARTNER_TEXTS(Sailor) }; -static const u8 *const gUnknown_085DD370[] = +static const u8 *const sPartnerTextsCollector[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247942, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247991, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18 + PARTNER_TEXTS(Collector) }; -static const u8 *const gUnknown_085DD384[] = +static const u8 *const sPartnerTextsPkmnRangerM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16 + PARTNER_TEXTS(PkmnRangerM) }; -static const u8 *const gUnknown_085DD398[] = +static const u8 *const sPartnerTextsPkmnRangerF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23 + PARTNER_TEXTS(PkmnRangerF) }; -static const u8 *const gUnknown_085DD3AC[] = +static const u8 *const sPartnerTextsAromaLady[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E + PARTNER_TEXTS(AromaLady) }; -static const u8 *const gUnknown_085DD3C0[] = +static const u8 *const sPartnerTextsRuinManiac[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E + PARTNER_TEXTS(RuinManiac) }; -static const u8 *const gUnknown_085DD3D4[] = +static const u8 *const sPartnerTextsCoolTrainerM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D + PARTNER_TEXTS(CoolTrainerM) }; -static const u8 *const gUnknown_085DD3E8[] = +static const u8 *const sPartnerTextsCoolTrainerF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248031, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E + PARTNER_TEXTS(CoolTrainerF) }; -static const u8 *const gUnknown_085DD3FC[] = +static const u8 *const sPartnerTextsPokemaniac[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248128, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248151 + PARTNER_TEXTS(Pokemaniac) }; -static const u8 *const gUnknown_085DD410[] = +static const u8 *const sPartnerTextsKindler[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248221, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F + PARTNER_TEXTS(Kindler) }; -static const u8 *const gUnknown_085DD424[] = +static const u8 *const sPartnerTextsCamper[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_248297, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248321, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D + PARTNER_TEXTS(Camper) }; -static const u8 *const gUnknown_085DD438[] = +static const u8 *const sPartnerTextsPicnicker[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_248369, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248401, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248431 + PARTNER_TEXTS(Picnicker) }; -static const u8 *const gUnknown_085DD44C[] = +static const u8 *const sPartnerTextsPsychicM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_248467, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248477, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248517 + PARTNER_TEXTS(PsychicM) }; -static const u8 *const gUnknown_085DD460[] = +static const u8 *const sPartnerTextsPsychicF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_248553, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248614 + PARTNER_TEXTS(PsychicF) }; -static const u8 *const gUnknown_085DD474[] = +static const u8 *const sPartnerTextsSchoolKidF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248661, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248671, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF + PARTNER_TEXTS(SchoolKidF) }; -static const u8 *const gUnknown_085DD488[] = +static const u8 *const sPartnerTextsPkmnBreederF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_248725, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248751, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248781, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7 + PARTNER_TEXTS(PkmnBreederF) }; -static const u8 *const gUnknown_085DD49C[] = +static const u8 *const sPartnerTextsPokefanF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_248829, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248892, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248908 + PARTNER_TEXTS(PokefanF) }; -static const u8 *const gUnknown_085DD4B0[] = +static const u8 *const sPartnerTextsSwimmerF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD, - BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7 + PARTNER_TEXTS(SwimmerF) }; -static const u8 *const gUnknown_085DD4C4[] = +static const u8 *const sPartnerTextsSwimmingTriathleteM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB + PARTNER_TEXTS(SwimmingTriathleteM) }; -static const u8 *const gUnknown_085DD4D8[] = +static const u8 *const sPartnerTextsSwimmingTriathleteF[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE + PARTNER_TEXTS(SwimmingTriathleteF) }; -static const u8 *const gUnknown_085DD4EC[] = +static const u8 *const sPartnerTextsSwimmerM[] = { - BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF, - BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04 + PARTNER_TEXTS(SwimmerM) }; struct { u32 facilityClass; const u8 *const *strings; -} const gUnknown_085DD500[] = +} const sPartnerTrainerTextTables[] = { - {FACILITY_CLASS_LASS, gUnknown_085DD118}, - {FACILITY_CLASS_YOUNGSTER, gUnknown_085DD12C}, - {FACILITY_CLASS_HIKER, gUnknown_085DD140}, - {FACILITY_CLASS_BEAUTY, gUnknown_085DD154}, - {FACILITY_CLASS_FISHERMAN, gUnknown_085DD168}, - {FACILITY_CLASS_LADY, gUnknown_085DD17C}, - {FACILITY_CLASS_CYCLING_TRIATHLETE_F, gUnknown_085DD190}, - {FACILITY_CLASS_BUG_CATCHER, gUnknown_085DD1A4}, - {FACILITY_CLASS_SCHOOL_KID_M, gUnknown_085DD1B8}, - {FACILITY_CLASS_RICH_BOY, gUnknown_085DD1CC}, - {FACILITY_CLASS_BLACK_BELT, gUnknown_085DD1E0}, - {FACILITY_CLASS_TUBER_F, gUnknown_085DD1F4}, - {FACILITY_CLASS_HEX_MANIAC, gUnknown_085DD208}, - {FACILITY_CLASS_PKMN_BREEDER_M, gUnknown_085DD21C}, - {FACILITY_CLASS_RUNNING_TRIATHLETE_F, gUnknown_085DD230}, - {FACILITY_CLASS_RUNNING_TRIATHLETE_M, gUnknown_085DD244}, - {FACILITY_CLASS_BATTLE_GIRL, gUnknown_085DD258}, - {FACILITY_CLASS_CYCLING_TRIATHLETE_M, gUnknown_085DD26C}, - {FACILITY_CLASS_TUBER_M, gUnknown_085DD280}, - {FACILITY_CLASS_GUITARIST, gUnknown_085DD294}, - {FACILITY_CLASS_GENTLEMAN, gUnknown_085DD2A8}, - {FACILITY_CLASS_POKEFAN_M, gUnknown_085DD2BC}, - {FACILITY_CLASS_EXPERT_M, gUnknown_085DD2D0}, - {FACILITY_CLASS_EXPERT_F, gUnknown_085DD2E4}, - {FACILITY_CLASS_DRAGON_TAMER, gUnknown_085DD2F8}, - {FACILITY_CLASS_BIRD_KEEPER, gUnknown_085DD30C}, - {FACILITY_CLASS_NINJA_BOY, gUnknown_085DD320}, - {FACILITY_CLASS_PARASOL_LADY, gUnknown_085DD334}, - {FACILITY_CLASS_BUG_MANIAC, gUnknown_085DD348}, - {FACILITY_CLASS_SAILOR, gUnknown_085DD35C}, - {FACILITY_CLASS_COLLECTOR, gUnknown_085DD370}, - {FACILITY_CLASS_PKMN_RANGER_M, gUnknown_085DD384}, - {FACILITY_CLASS_PKMN_RANGER_F, gUnknown_085DD398}, - {FACILITY_CLASS_AROMA_LADY, gUnknown_085DD3AC}, - {FACILITY_CLASS_RUIN_MANIAC, gUnknown_085DD3C0}, - {FACILITY_CLASS_COOLTRAINER_M, gUnknown_085DD3D4}, - {FACILITY_CLASS_COOLTRAINER_F, gUnknown_085DD3E8}, - {FACILITY_CLASS_POKEMANIAC, gUnknown_085DD3FC}, - {FACILITY_CLASS_KINDLER, gUnknown_085DD410}, - {FACILITY_CLASS_CAMPER, gUnknown_085DD424}, - {FACILITY_CLASS_PICNICKER, gUnknown_085DD438}, - {FACILITY_CLASS_PSYCHIC_M, gUnknown_085DD44C}, - {FACILITY_CLASS_PSYCHIC_F, gUnknown_085DD460}, - {FACILITY_CLASS_SCHOOL_KID_F, gUnknown_085DD474}, - {FACILITY_CLASS_PKMN_BREEDER_F, gUnknown_085DD488}, - {FACILITY_CLASS_POKEFAN_F, gUnknown_085DD49C}, - {FACILITY_CLASS_SWIMMER_F, gUnknown_085DD4B0}, - {FACILITY_CLASS_SWIMMING_TRIATHLETE_M, gUnknown_085DD4C4}, - {FACILITY_CLASS_SWIMMING_TRIATHLETE_F, gUnknown_085DD4D8}, - {FACILITY_CLASS_SWIMMER_M, gUnknown_085DD4EC} + {FACILITY_CLASS_LASS, sPartnerTextsLass}, + {FACILITY_CLASS_YOUNGSTER, sPartnerTextsYoungster}, + {FACILITY_CLASS_HIKER, sPartnerTextsHiker}, + {FACILITY_CLASS_BEAUTY, sPartnerTextsBeauty}, + {FACILITY_CLASS_FISHERMAN, sPartnerTextsFisherman}, + {FACILITY_CLASS_LADY, sPartnerTextsLady}, + {FACILITY_CLASS_CYCLING_TRIATHLETE_F, sPartnerTextsCyclingTriathleteF}, + {FACILITY_CLASS_BUG_CATCHER, sPartnerTextsBugCatcher}, + {FACILITY_CLASS_SCHOOL_KID_M, sPartnerTextsSchoolKidM}, + {FACILITY_CLASS_RICH_BOY, sPartnerTextsRichBoy}, + {FACILITY_CLASS_BLACK_BELT, sPartnerTextsBlackBelt}, + {FACILITY_CLASS_TUBER_F, sPartnerTextsTuberF}, + {FACILITY_CLASS_HEX_MANIAC, sPartnerTextsHexManiac}, + {FACILITY_CLASS_PKMN_BREEDER_M, sPartnerTextsPkmnBreederM}, + {FACILITY_CLASS_RUNNING_TRIATHLETE_F, sPartnerTextsRunningTriathleteF}, + {FACILITY_CLASS_RUNNING_TRIATHLETE_M, sPartnerTextsRunningTriathleteM}, + {FACILITY_CLASS_BATTLE_GIRL, sPartnerTextsBattleGirl}, + {FACILITY_CLASS_CYCLING_TRIATHLETE_M, sPartnerTextsCyclingTriathleteM}, + {FACILITY_CLASS_TUBER_M, sPartnerTextsTuberM}, + {FACILITY_CLASS_GUITARIST, sPartnerTextsGuitarist}, + {FACILITY_CLASS_GENTLEMAN, sPartnerTextsGentleman}, + {FACILITY_CLASS_POKEFAN_M, sPartnerTextsPokefanM}, + {FACILITY_CLASS_EXPERT_M, sPartnerTextsExpertM}, + {FACILITY_CLASS_EXPERT_F, sPartnerTextsExpertF}, + {FACILITY_CLASS_DRAGON_TAMER, sPartnerTextsDragonTamer}, + {FACILITY_CLASS_BIRD_KEEPER, sPartnerTextsBirdKeeper}, + {FACILITY_CLASS_NINJA_BOY, sPartnerTextsNinjaBoy}, + {FACILITY_CLASS_PARASOL_LADY, sPartnerTextsParasolLady}, + {FACILITY_CLASS_BUG_MANIAC, sPartnerTextsBugManiac}, + {FACILITY_CLASS_SAILOR, sPartnerTextsSailor}, + {FACILITY_CLASS_COLLECTOR, sPartnerTextsCollector}, + {FACILITY_CLASS_PKMN_RANGER_M, sPartnerTextsPkmnRangerM}, + {FACILITY_CLASS_PKMN_RANGER_F, sPartnerTextsPkmnRangerF}, + {FACILITY_CLASS_AROMA_LADY, sPartnerTextsAromaLady}, + {FACILITY_CLASS_RUIN_MANIAC, sPartnerTextsRuinManiac}, + {FACILITY_CLASS_COOLTRAINER_M, sPartnerTextsCoolTrainerM}, + {FACILITY_CLASS_COOLTRAINER_F, sPartnerTextsCoolTrainerF}, + {FACILITY_CLASS_POKEMANIAC, sPartnerTextsPokemaniac}, + {FACILITY_CLASS_KINDLER, sPartnerTextsKindler}, + {FACILITY_CLASS_CAMPER, sPartnerTextsCamper}, + {FACILITY_CLASS_PICNICKER, sPartnerTextsPicnicker}, + {FACILITY_CLASS_PSYCHIC_M, sPartnerTextsPsychicM}, + {FACILITY_CLASS_PSYCHIC_F, sPartnerTextsPsychicF}, + {FACILITY_CLASS_SCHOOL_KID_F, sPartnerTextsSchoolKidF}, + {FACILITY_CLASS_PKMN_BREEDER_F, sPartnerTextsPkmnBreederF}, + {FACILITY_CLASS_POKEFAN_F, sPartnerTextsPokefanF}, + {FACILITY_CLASS_SWIMMER_F, sPartnerTextsSwimmerF}, + {FACILITY_CLASS_SWIMMING_TRIATHLETE_M, sPartnerTextsSwimmingTriathleteM}, + {FACILITY_CLASS_SWIMMING_TRIATHLETE_F, sPartnerTextsSwimmingTriathleteF}, + {FACILITY_CLASS_SWIMMER_M, sPartnerTextsSwimmerM} }; -static const u8 *const *const gUnknown_085DD690[] = +static const u8 *const *const sPartnerApprenticeTextTables[NUM_APPRENTICES] = { - gUnknown_085DCFD8, - gUnknown_085DCFEC, - gUnknown_085DD000, - gUnknown_085DD014, - gUnknown_085DD028, - gUnknown_085DD03C, - gUnknown_085DD050, - gUnknown_085DD064, - gUnknown_085DD078, - gUnknown_085DD08C, - gUnknown_085DD0A0, - gUnknown_085DD0B4, - gUnknown_085DD0C8, - gUnknown_085DD0DC, - gUnknown_085DD0F0, - gUnknown_085DD104 + sPartnerApprenticeTexts1, + sPartnerApprenticeTexts2, + sPartnerApprenticeTexts3, + sPartnerApprenticeTexts4, + sPartnerApprenticeTexts5, + sPartnerApprenticeTexts6, + sPartnerApprenticeTexts7, + sPartnerApprenticeTexts8, + sPartnerApprenticeTexts9, + sPartnerApprenticeTexts10, + sPartnerApprenticeTexts11, + sPartnerApprenticeTexts12, + sPartnerApprenticeTexts13, + sPartnerApprenticeTexts14, + sPartnerApprenticeTexts15, + sPartnerApprenticeTexts16 }; struct @@ -1022,9 +766,9 @@ struct u8 fixedIV; u8 level; u8 nature; - u8 evs[6]; + u8 evs[NUM_STATS]; u16 moves[MAX_MON_MOVES]; -} const sStevenMons[3] = +} const sStevenMons[MULTI_PARTY_SIZE] = { { .species = SPECIES_METANG, @@ -1056,22 +800,22 @@ struct static void (* const sBattleTowerFuncs[])(void) = { - [BATTLE_TOWER_FUNC_INIT] = InitTowerChallenge, - [BATTLE_TOWER_FUNC_GET_DATA] = GetTowerData, - [BATTLE_TOWER_FUNC_SET_DATA] = SetTowerData, - [BATTLE_TOWER_FUNC_SET_OPPONENT] = SetNextFacilityOpponent, - [BATTLE_TOWER_FUNC_SET_BATTLE_WON] = SetTowerBattleWon, - [BATTLE_TOWER_FUNC_GIVE_RIBBONS] = AwardBattleTowerRibbons, - [BATTLE_TOWER_FUNC_SAVE] = SaveTowerChallenge, - [BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO] = GetOpponentIntroSpeech, - [BATTLE_TOWER_FUNC_NOP] = nullsub_61, - [BATTLE_TOWER_FUNC_NOP2] = nullsub_116, - [BATTLE_TOWER_FUNC_10] = sub_81642A0, - [BATTLE_TOWER_FUNC_11] = sub_8164828, - [BATTLE_TOWER_FUNC_12] = sub_8164B74, - [BATTLE_TOWER_FUNC_13] = sub_8164DCC, - [BATTLE_TOWER_FUNC_14] = sub_8164DE4, - [BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA] = SetTowerInterviewData, + [BATTLE_TOWER_FUNC_INIT] = InitTowerChallenge, + [BATTLE_TOWER_FUNC_GET_DATA] = GetTowerData, + [BATTLE_TOWER_FUNC_SET_DATA] = SetTowerData, + [BATTLE_TOWER_FUNC_SET_OPPONENT] = SetNextFacilityOpponent, + [BATTLE_TOWER_FUNC_SET_BATTLE_WON] = SetTowerBattleWon, + [BATTLE_TOWER_FUNC_GIVE_RIBBONS] = AwardBattleTowerRibbons, + [BATTLE_TOWER_FUNC_SAVE] = SaveTowerChallenge, + [BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO] = GetOpponentIntroSpeech, + [BATTLE_TOWER_FUNC_NOP] = nullsub_61, + [BATTLE_TOWER_FUNC_NOP2] = nullsub_116, + [BATTLE_TOWER_FUNC_LOAD_PARTNERS] = LoadMultiPartnerCandidatesData, + [BATTLE_TOWER_FUNC_PARTNER_MSG] = ShowPartnerCandidateMessage, + [BATTLE_TOWER_FUNC_LOAD_LINK_OPPONENTS] = LoadLinkMultiOpponentsData, + [BATTLE_TOWER_FUNC_13] = sub_8164DCC, + [BATTLE_TOWER_FUNC_SET_PARTNER_GFX] = SetMultiPartnerGfx, + [BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA] = SetTowerInterviewData, }; static const u32 sWinStreakFlags[][2] = @@ -1090,9 +834,10 @@ static const u32 sWinStreakMasks[][2] = {~(STREAK_TOWER_LINK_MULTIS_50), ~(STREAK_TOWER_LINK_MULTIS_OPEN)}, }; -static const u8 gUnknown_085DF9EC[] = +// The challenge number at which an Apprentice can appear, depending on how many of their questions were answered +static const u8 sApprenticeChallengeThreshold[MAX_APPRENTICE_QUESTIONS] = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c + 1, 2, 3, 4, 5, 8, 9, 10, 11, 12 }; // Unclear why this was duplicated @@ -1162,7 +907,7 @@ static void InitTowerChallenge(void) gSaveBlock2Ptr->frontier.challengeStatus = CHALLENGE_STATUS_SAVING; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.challengePaused = FALSE; - gSaveBlock2Ptr->frontier.field_CA9_b = 0; + gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE; ResetFrontierTrainerIds(); if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode])) gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] = 0; @@ -1279,7 +1024,7 @@ static bool8 ChooseSpecialBattleTowerTrainer(void) for (i = 0; i < APPRENTICE_COUNT; i++) { if (gSaveBlock2Ptr->apprentices[i].lvlMode != 0 - && gUnknown_085DF9EC[gSaveBlock2Ptr->apprentices[i].numQuestions] == winStreak + && sApprenticeChallengeThreshold[gSaveBlock2Ptr->apprentices[i].numQuestions] == winStreak && gSaveBlock2Ptr->apprentices[i].lvlMode - 1 == lvlMode) { trainerIds[idsCount] = i + TRAINER_RECORD_MIXING_APPRENTICE; @@ -2448,7 +2193,7 @@ static void nullsub_116(void) } -static void sub_81640E0(u16 trainerId) +static void GetApprenticeMultiPartnerParty(u16 trainerId) { s32 i, count; u32 validSpecies[3]; @@ -2473,7 +2218,7 @@ static void sub_81640E0(u16 trainerId) } while (gUnknown_03006298[0] == gUnknown_03006298[1]); } -static void sub_8164188(u16 trainerId) +static void GetRecordMixFriendMultiPartnerParty(u16 trainerId) { s32 i, count; u32 validSpecies[3]; @@ -2501,7 +2246,7 @@ static void sub_8164188(u16 trainerId) } while (gUnknown_03006298[2] == gUnknown_03006298[3]); } -static void sub_81642A0(void) +static void LoadMultiPartnerCandidatesData(void) { s32 i, j, k; u32 spArray[5]; @@ -2576,7 +2321,7 @@ static void sub_81642A0(void) for (i = 0; i < APPRENTICE_COUNT; i++) { if (gSaveBlock2Ptr->apprentices[i].lvlMode != 0 - && gUnknown_085DF9EC[gSaveBlock2Ptr->apprentices[i].numQuestions] / 7 <= challengeNum + && sApprenticeChallengeThreshold[gSaveBlock2Ptr->apprentices[i].numQuestions] / 7 <= challengeNum && gSaveBlock2Ptr->apprentices[i].lvlMode - 1 == lvlMode) { k = 0; @@ -2600,7 +2345,7 @@ static void sub_81642A0(void) gSaveBlock2Ptr->frontier.trainerIds[6] = spArray[Random() % r10]; objEventTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1); - sub_81640E0(gSaveBlock2Ptr->frontier.trainerIds[6]); + GetApprenticeMultiPartnerParty(gSaveBlock2Ptr->frontier.trainerIds[6]); } r10 = 0; @@ -2643,7 +2388,7 @@ static void sub_81642A0(void) gSaveBlock2Ptr->frontier.trainerIds[7] = spArray[Random() % r10]; objEventTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2); - sub_8164188(gSaveBlock2Ptr->frontier.trainerIds[7]); + GetRecordMixFriendMultiPartnerParty(gSaveBlock2Ptr->frontier.trainerIds[7]); } } @@ -2682,9 +2427,9 @@ static void sub_81646BC(u16 trainerId, u16 monSetId) StringCopy(gStringVar2, gSpeciesNames[species]); } -static void sub_8164828(void) +static void ShowPartnerCandidateMessage(void) { - s32 i, j, arrId; + s32 i, j, partnerId; s32 monSetId; s32 level = SetFacilityPtrsGetLevel(); u16 winStreak = GetCurrentFacilityWinStreak(); @@ -2692,15 +2437,15 @@ static void sub_8164828(void) s32 k = gSpecialVar_LastTalked - 2; s32 trainerId = gSaveBlock2Ptr->frontier.trainerIds[k]; - for (arrId = 0; arrId < ARRAY_COUNT(gUnknown_085DD500); arrId++) + for (partnerId = 0; partnerId < ARRAY_COUNT(sPartnerTrainerTextTables); partnerId++) { - if (gUnknown_085DD500[arrId].facilityClass == GetFrontierTrainerFacilityClass(trainerId)) + if (sPartnerTrainerTextTables[partnerId].facilityClass == GetFrontierTrainerFacilityClass(trainerId)) break; } switch (gSpecialVar_0x8005) { - case 0: + case PARTNER_MSGID_INTRO: if (trainerId == TRAINER_EREADER) return; if (trainerId < TRAINER_RECORD_MIXING_FRIEND) @@ -2722,15 +2467,15 @@ static void sub_8164828(void) GetFrontierTrainerName(gStringVar3, trainerId); } break; - case 1: + case PARTNER_MSGID_MON1: monSetId = gSaveBlock2Ptr->frontier.trainerIds[8 + k * 2]; sub_81646BC(trainerId, monSetId); break; - case 2: + case PARTNER_MSGID_MON2_ASK: monSetId = gSaveBlock2Ptr->frontier.trainerIds[9 + k * 2]; sub_81646BC(trainerId, monSetId); break; - case 3: + case PARTNER_MSGID_ACCEPT: gPartnerTrainerId = trainerId; if (trainerId < TRAINER_RECORD_MIXING_FRIEND) { @@ -2767,29 +2512,31 @@ static void sub_8164828(void) } gSaveBlock2Ptr->frontier.trainerIds[17] = trainerId; break; - case 4: + case PARTNER_MSGID_REJECT: break; } if (trainerId == TRAINER_EREADER) return; + // First check is redundant, only needs to make sure it's not an Apprentice if (trainerId < TRAINER_RECORD_MIXING_FRIEND) { - ShowFieldMessage(gUnknown_085DD500[arrId].strings[gSpecialVar_0x8005]); + ShowFieldMessage(sPartnerTrainerTextTables[partnerId].strings[gSpecialVar_0x8005]); } else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE) { - ShowFieldMessage(gUnknown_085DD500[arrId].strings[gSpecialVar_0x8005]); + ShowFieldMessage(sPartnerTrainerTextTables[partnerId].strings[gSpecialVar_0x8005]); } + // Trainer is a former/record-mixed Apprentice, do Apprentice message else { - u8 id = gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id; - ShowFieldMessage(gUnknown_085DD690[id][gSpecialVar_0x8005]); + u8 apprenticeId = gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id; + ShowFieldMessage(sPartnerApprenticeTextTables[apprenticeId][gSpecialVar_0x8005]); } } -static void sub_8164B74(void) +static void LoadLinkMultiOpponentsData(void) { s32 challengeNum; s32 i, j; @@ -2884,9 +2631,10 @@ static void sub_8164DCC(void) sub_800AC34(); } -static void sub_8164DE4(void) +static void SetMultiPartnerGfx(void) { - SetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[17], 0xF); + // 0xF below means use VAR_OBJ_GFX_ID_E + SetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[17], 0xF); } static void SetTowerInterviewData(void) diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 873d01dc75..89175c1bf7 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -527,7 +527,7 @@ static void Task_CloseBerryTagScreen(u8 taskId) DestroyFlavorCircleSprites(); Free(sBerryTag); FreeAllWindowBuffers(); - SetMainCallback2(bag_menu_mail_related); + SetMainCallback2(CB2_ReturnToBagMenuPocket); DestroyTask(taskId); } } diff --git a/src/bike.c b/src/bike.c index b265a31bb5..15857778cc 100644 --- a/src/bike.c +++ b/src/bike.c @@ -1056,7 +1056,7 @@ void Bike_HandleBumpySlopeJump(void) bool32 IsRunningDisallowed(u8 metatile) { - if (!(gMapHeader.flags & 4) || IsRunningDisallowedByMetatile(metatile) == TRUE) + if (!(gMapHeader.flags & MAP_ALLOW_RUN) || IsRunningDisallowedByMetatile(metatile) == TRUE) return TRUE; else return FALSE; diff --git a/src/data/battle_frontier/apprentice.h b/src/data/battle_frontier/apprentice.h index 0fdb87f96a..349dc96196 100644 --- a/src/data/battle_frontier/apprentice.h +++ b/src/data/battle_frontier/apprentice.h @@ -934,7 +934,7 @@ static const bool8 sValidApprenticeMoves[MOVES_COUNT] = // WHICH_MOVE has max 5 occurrences, defined as NUM_WHICH_MOVE_QUESTIONS // WHICH_FIRST has max 1 occurrence, lead mon should only be chosen once // WHICH_SPEECH has max 1 occurrence, as the apprentice leaves after its asked -static const u8 sQuestionPossibilities[] = +static const u8 sQuestionPossibilities[MAX_APPRENTICE_QUESTIONS] = { QUESTION_ID_WHAT_ITEM, QUESTION_ID_WHAT_ITEM, diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 2c153b0ef8..698d97a436 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -236,7 +236,7 @@ const u8 gItemEffect_PPMax[9] = { }; const u8 gItemEffect_GuardSpec[8] = { - [3] = ITEM3_MIST, + [3] = ITEM3_GUARD_SPEC, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [6] = 1, [7] = 1, diff --git a/src/decoration.c b/src/decoration.c index 8c14be8e15..da7e169cb3 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -14,6 +14,7 @@ #include "graphics.h" #include "international_string_util.h" #include "item_icon.h" +#include "item_menu.h" #include "list_menu.h" #include "main.h" #include "menu.h" diff --git a/src/field_door.c b/src/field_door.c index c197aca147..8fb5cb948b 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -9,7 +9,7 @@ #include "constants/maps.h" #include "constants/songs.h" -bool8 sub_808A964(void); +static bool8 ShouldUseMultiCorridorDoor(void); const u8 DoorAnimTiles_04[][0x100] = { @@ -698,14 +698,14 @@ static void DrawDoor(const struct DoorGraphics *gfx, const struct DoorAnimFrame if (frame->offset == 0xFFFF) { DrawClosedDoorTiles(gfx, x, y); - if (sub_808A964()) + if (ShouldUseMultiCorridorDoor()) DrawClosedDoorTiles(gfx, gSpecialVar_0x8004 + 7, gSpecialVar_0x8005 + 7); } else { CopyDoorTilesToVram(gfx, frame); DrawCurrentDoorAnimFrame(gfx, x, y, gfx->palette); - if (sub_808A964()) + if (ShouldUseMultiCorridorDoor()) DrawCurrentDoorAnimFrame(gfx, gSpecialVar_0x8004 + 7, gSpecialVar_0x8005 + 7, gfx->palette); } } @@ -885,11 +885,13 @@ u32 GetDoorSoundEffect(u32 x, u32 y) return SE_DOOR; } -bool8 sub_808A964(void) +// Opens the Battle Tower multi partner's door in sync with the player's door +static bool8 ShouldUseMultiCorridorDoor(void) { - if (FlagGet(FLAG_SPECIAL_FLAG_0x4002)) + if (FlagGet(FLAG_ENABLE_MULTI_CORRIDOR_DOOR)) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR)) { return TRUE; } diff --git a/src/field_specials.c b/src/field_specials.c index 0e7637e6da..3101f0b2a4 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -46,6 +46,7 @@ #include "wallclock.h" #include "window.h" #include "constants/battle_frontier.h" +#include "constants/battle_tower.h" #include "constants/decorations.h" #include "constants/event_objects.h" #include "constants/event_object_movement.h" @@ -83,7 +84,7 @@ static EWRAM_DATA u8 sScrollableMultichoice_ItemSpriteId = 0; static EWRAM_DATA u8 sBattlePointsWindowId = 0; static EWRAM_DATA u8 sFrontierExchangeCorner_ItemIconWindowId = 0; static EWRAM_DATA u8 sPCBoxToSendMon = 0; -static EWRAM_DATA u32 sUnknown_0203AB70 = 0; +static EWRAM_DATA u32 sBattleTowerMultiBattleTypeFlags = 0; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; @@ -128,7 +129,7 @@ static void ShowFrontierExchangeCornerItemIcon(u16 item); static void Task_DeoxysRockInteraction(u8 taskId); static void ChangeDeoxysRockLevel(u8 a0); static void WaitForDeoxysRockMovement(u8 taskId); -static void sub_813B57C(u8 taskId); +static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId); static void Task_LoopWingFlapSE(u8 taskId); static void Task_CloseBattlePikeCurtain(u8 taskId); static u8 DidPlayerGetFirstFans(void); @@ -1701,10 +1702,10 @@ bool8 IsBadEggInParty(void) return FALSE; } -bool8 InMultiBattleRoom(void) +bool8 InMultiPartnerRoom(void) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM) - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM) && + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM) && VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_MULTIS) return TRUE; return FALSE; @@ -3746,7 +3747,7 @@ bool32 ShouldDistributeEonTicket(void) void sub_813B534(void) { - sUnknown_0203AB70 = gBattleTypeFlags; + sBattleTowerMultiBattleTypeFlags = gBattleTypeFlags; gBattleTypeFlags = 0; if (!gReceivedRemoteLinkPlayers) { @@ -3754,12 +3755,12 @@ void sub_813B534(void) } } -void sub_813B568(void) +void LinkRetireStatusWithBattleTowerPartner(void) { - CreateTask(sub_813B57C, 5); + CreateTask(Task_LinkRetireStatusWithBattleTowerPartner, 5); } -static void sub_813B57C(u8 taskId) +static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId) { switch (gTasks[taskId].data[0]) { @@ -3790,21 +3791,24 @@ static void sub_813B57C(u8 taskId) { gSpecialVar_0x8005 = gBlockRecvBuffer[1][0]; ResetBlockReceivedFlag(1); - if (gSpecialVar_0x8004 == 1 && gSpecialVar_0x8005 == 1) + if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE + && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE) { - gSpecialVar_Result = 1; + gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_BOTH_RETIRE; } - else if (gSpecialVar_0x8004 == 0 && gSpecialVar_0x8005 == 1) + else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_CONTINUE + && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE) { - gSpecialVar_Result = 2; + gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_PARTNER_RETIRE; } - else if (gSpecialVar_0x8004 == 1 && gSpecialVar_0x8005 == 0) + else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE + && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_CONTINUE) { - gSpecialVar_Result = 3; + gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_PLAYER_RETIRE; } else { - gSpecialVar_Result = 0; + gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_CONTINUE; } } gTasks[taskId].data[0]++; @@ -3842,14 +3846,14 @@ static void sub_813B57C(u8 taskId) case 5: if (GetMultiplayerId() == 0) { - if (gSpecialVar_Result == 2) + if (gSpecialVar_Result == BATTLE_TOWER_LINKSTAT_PARTNER_RETIRE) { ShowFieldAutoScrollMessage(gText_YourPartnerHasRetired); } } else { - if (gSpecialVar_Result == 3) + if (gSpecialVar_Result == BATTLE_TOWER_LINKSTAT_PLAYER_RETIRE) { ShowFieldAutoScrollMessage(gText_YourPartnerHasRetired); } @@ -3880,7 +3884,7 @@ static void sub_813B57C(u8 taskId) { sub_800AC34(); } - gBattleTypeFlags = sUnknown_0203AB70; + gBattleTypeFlags = sBattleTowerMultiBattleTypeFlags; EnableBothScriptContexts(); DestroyTask(taskId); break; diff --git a/src/fieldmap.c b/src/fieldmap.c index f595803ff6..21bbaa8f86 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -859,7 +859,7 @@ int sub_8088A4C(struct MapConnection *connection, int x, int y) return FALSE; } -struct MapConnection *sub_8088A8C(s16 x, s16 y) +struct MapConnection *GetConnectionAtCoords(s16 x, s16 y) { int count; struct MapConnection *connection; diff --git a/src/fldeff_dig.c b/src/fldeff_dig.c index b39d25182b..7f10e126ef 100644 --- a/src/fldeff_dig.c +++ b/src/fldeff_dig.c @@ -57,7 +57,7 @@ static void sub_8135780(void) } else { - taskId = CreateTask(task08_080A1C44, 8); + taskId = CreateTask(Task_UseDigEscapeRopeOnField, 8); gTasks[taskId].data[0] = 0; } } diff --git a/src/frontier_pass.c b/src/frontier_pass.c index 79c1ce6f49..42a518ed66 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -1531,7 +1531,7 @@ static void Task_HandleFrontierMap(u8 taskId) static u8 MapNumToFrontierFacilityId(u16 mapNum) // id + 1, zero means not a frontier map number { if ((mapNum >= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_LOBBY) && mapNum <= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM)) - || (mapNum >= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM) && mapNum <= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2))) + || (mapNum >= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM) && mapNum <= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM))) return FRONTIER_FACILITY_TOWER + 1; else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_DOME_LOBBY) || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR) diff --git a/src/frontier_util.c b/src/frontier_util.c index 4f7ab1ba6e..c77a2a8386 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -840,8 +840,8 @@ static void GetFrontierData(void) gSpecialVar_Result = gBattleOutcome; gBattleOutcome = 0; break; - case FRONTIER_DATA_6: - gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_CA9_b; + case FRONTIER_DATA_RECORD_DISABLED: + gSpecialVar_Result = gSaveBlock2Ptr->frontier.disableRecordBattle; break; case FRONTIER_DATA_HEARD_BRAIN_SPEECH: gSpecialVar_Result = gSaveBlock2Ptr->frontier.battledBrainFlags & sBattledBrainBitFlags[facility][hasSymbol]; @@ -875,8 +875,8 @@ static void SetFrontierData(void) for (i = 0; i < MAX_FRONTIER_PARTY_SIZE; i++) gSaveBlock2Ptr->frontier.selectedPartyMons[i] = gSelectedOrderFromParty[i]; break; - case FRONTIER_DATA_6: - gSaveBlock2Ptr->frontier.field_CA9_b = gSpecialVar_0x8006; + case FRONTIER_DATA_RECORD_DISABLED: + gSaveBlock2Ptr->frontier.disableRecordBattle = gSpecialVar_0x8006; break; case FRONTIER_DATA_HEARD_BRAIN_SPEECH: gSaveBlock2Ptr->frontier.battledBrainFlags |= sBattledBrainBitFlags[facility][hasSymbol]; @@ -2173,7 +2173,7 @@ static void RestoreHeldItems(void) static void SaveRecordBattle(void) { gSpecialVar_Result = MoveRecordedBattleToSaveData(); - gSaveBlock2Ptr->frontier.field_CA9_b = 1; + gSaveBlock2Ptr->frontier.disableRecordBattle = TRUE; } static void BufferFrontierTrainerName(void) diff --git a/src/item_menu.c b/src/item_menu.c index 55222a2069..6d86d67bd0 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -136,7 +136,7 @@ void ItemMenu_Give(u8 taskId); void ItemMenu_Cancel(u8 taskId); void ItemMenu_UseInBattle(u8 taskId); void ItemMenu_CheckTag(u8 taskId); -void unknown_ItemMenu_Confirm(u8 taskId); +void Task_FadeAndCloseBagMenu(u8 taskId); void unknown_ItemMenu_Show(u8 taskId); void unknown_ItemMenu_Give2(u8 taskId); void unknown_ItemMenu_Confirm2(u8 taskId); @@ -216,7 +216,7 @@ const struct MenuAction sItemMenuActions[] = { {gMenuText_Walk, ItemMenu_UseOutOfBattle}, {gMenuText_Deselect, ItemMenu_Register}, {gMenuText_CheckTag, ItemMenu_CheckTag}, - {gMenuText_Confirm, unknown_ItemMenu_Confirm}, + {gMenuText_Confirm, Task_FadeAndCloseBagMenu}, {gMenuText_Show, unknown_ItemMenu_Show}, {gMenuText_Give2, unknown_ItemMenu_Give2}, {gMenuText_Confirm, unknown_ItemMenu_Confirm2}, @@ -241,7 +241,7 @@ const TaskFunc gUnknown_08614054[] = { unknown_item_menu_type, item_menu_type_2, DisplaySellItemAskString, - unknown_ItemMenu_Confirm, + Task_FadeAndCloseBagMenu, unknown_item_menu_type, DisplayDepositItemAskString, unknown_item_menu_type, @@ -942,7 +942,7 @@ void FreeBagItemListBuffers(void) Free(gBagMenu); } -void unknown_ItemMenu_Confirm(u8 taskId) +void Task_FadeAndCloseBagMenu(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = TaskCloseBagMenu_2; @@ -966,7 +966,7 @@ void TaskCloseBagMenu_2(u8 taskId) } } -void sub_81AB9A8(u8 pocketId) +void UpdatePocketItemList(u8 pocketId) { u16 i; struct BagPocket *pocket = &gBagPockets[pocketId]; @@ -997,7 +997,7 @@ void sub_81ABA6C(void) { u8 i; for (i = 0; i < POCKETS_COUNT; i++) - sub_81AB9A8(i); + UpdatePocketItemList(i); } void SetInitialScrollAndCursorPositions(u8 pocketId) @@ -1041,7 +1041,7 @@ void BagMenu_InitListsMenu(u8 taskId) u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; bag_menu_RemoveBagItem_message_window(4); DestroyListMenuTask(data[0], scrollPos, cursorPos); - sub_81AB9A8(gBagPositionStruct.pocket); + UpdatePocketItemList(gBagPositionStruct.pocket); SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); LoadBagItemListBuffers(gBagPositionStruct.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); @@ -1117,7 +1117,7 @@ void Task_BagMenu(u8 taskId) } PlaySE(SE_SELECT); gSpecialVar_ItemId = select; - gTasks[taskId].func = unknown_ItemMenu_Confirm; + gTasks[taskId].func = Task_FadeAndCloseBagMenu; break; default: // A_BUTTON PlaySE(SE_SELECT); @@ -1744,7 +1744,7 @@ void Task_ActuallyToss(u8 taskId) PlaySE(SE_SELECT); RemoveBagItem(gSpecialVar_ItemId, data[8]); DestroyListMenuTask(data[0], scrollPos, cursorPos); - sub_81AB9A8(gBagPositionStruct.pocket); + UpdatePocketItemList(gBagPositionStruct.pocket); SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); LoadBagItemListBuffers(gBagPositionStruct.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); @@ -1784,7 +1784,7 @@ void ItemMenu_Give(u8 taskId) else { gBagMenu->mainCallback2 = CB2_ChooseMonToGiveItem; - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); } } else @@ -1817,7 +1817,7 @@ void sub_81AD350(u8 taskId) void ItemMenu_CheckTag(u8 taskId) { gBagMenu->mainCallback2 = DoBerryTagScreen; - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); } void ItemMenu_Cancel(u8 taskId) @@ -1841,7 +1841,7 @@ void ItemMenu_UseInBattle(u8 taskId) } } -void bag_menu_mail_related(void) +void CB2_ReturnToBagMenuPocket(void) { GoToBagMenu(RETURN_LOCATION_UNCHANGED, POCKETS_COUNT, NULL); } @@ -1860,7 +1860,7 @@ void item_menu_type_2(u8 taskId) } else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) { - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); } else { @@ -1873,16 +1873,18 @@ void item_menu_type_b(u8 taskId) if (ItemIsMail(gSpecialVar_ItemId) == TRUE) DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350); else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) - gTasks[taskId].func = unknown_ItemMenu_Confirm; + gTasks[taskId].func = Task_FadeAndCloseBagMenu; else BagMenu_PrintItemCantBeHeld(taskId); } +#define tUsingRegisteredKeyItem data[3] + bool8 UseRegisteredKeyItemOnField(void) { u8 taskId; - if (InUnionRoom() == TRUE || InBattlePyramid() || InBattlePike() || InMultiBattleRoom() == TRUE) + if (InUnionRoom() == TRUE || InBattlePyramid() || InBattlePike() || InMultiPartnerRoom() == TRUE) return FALSE; HideMapNamePopUpWindow(); ChangeBgY_ScreenOff(0, 0, 0); @@ -1896,16 +1898,20 @@ bool8 UseRegisteredKeyItemOnField(void) sub_808BCF4(); gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem; taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1Ptr->registeredItem), 8); - gTasks[taskId].data[3] = 1; + gTasks[taskId].tUsingRegisteredKeyItem = TRUE; return TRUE; } else + { gSaveBlock1Ptr->registeredItem = ITEM_NONE; + } } ScriptContext1_SetupScript(EventScript_SelectWithoutRegisteredItem); return TRUE; } +#undef tUsingRegisteredKeyItem + void DisplaySellItemAskString(u8 taskId) { s16* data = gTasks[taskId].data; @@ -2012,7 +2018,7 @@ void sub_81AD8C8(u8 taskId) RemoveBagItem(gSpecialVar_ItemId, data[8]); AddMoney(&gSaveBlock1Ptr->money, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]); DestroyListMenuTask(data[0], scrollPos, cursorPos); - sub_81AB9A8(gBagPositionStruct.pocket); + UpdatePocketItemList(gBagPositionStruct.pocket); SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); LoadBagItemListBuffers(gBagPositionStruct.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); @@ -2186,7 +2192,7 @@ void Task_WallyTutorialBagMenu(u8 taskId) BagMenu_RemoveSomeWindow(); DestroyListMenuTask(data[0], 0, 0); RestoreBagAfterWallyTutorial(); - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); break; default: data[8]++; @@ -2200,7 +2206,7 @@ void unknown_ItemMenu_Show(u8 taskId) gSpecialVar_0x8005 = gSpecialVar_ItemId; gSpecialVar_Result = 1; BagMenu_RemoveSomeWindow(); - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); } void CB2_ApprenticeExitBagMenu(void) @@ -2214,7 +2220,7 @@ void unknown_ItemMenu_Give2(u8 taskId) RemoveBagItem(gSpecialVar_ItemId, 1); gSpecialVar_Result = 1; BagMenu_RemoveSomeWindow(); - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); } void CB2_FavorLadyExitBagMenu(void) @@ -2227,7 +2233,7 @@ void unknown_ItemMenu_Confirm2(u8 taskId) { gSpecialVar_Result = 1; BagMenu_RemoveSomeWindow(); - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); } void CB2_QuizLadyExitBagMenu(void) diff --git a/src/item_use.c b/src/item_use.c index 82ffd7170c..954d4b26fa 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -11,6 +11,7 @@ #include "event_data.h" #include "event_object_lock.h" #include "event_object_movement.h" +#include "event_scripts.h" #include "fieldmap.h" #include "field_effect.h" #include "field_player_avatar.h" @@ -43,49 +44,40 @@ #include "constants/songs.h" #include "constants/vars.h" -extern u8 BerryTree_EventScript_ItemUsePlantBerry[]; -extern u8 BerryTree_EventScript_ItemUseWailmerPail[]; -extern u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[]; - -void SetUpItemUseCallback(u8 taskId); -void MapPostLoadHook_UseItem(void); -void sub_80AF6D4(void); -void Task_CallItemUseOnFieldCallback(u8 taskId); -void BagMenu_InitListsMenu(u8 taskId); -void ItemUseOnFieldCB_Bike(u8 taskId); -void ItemUseOnFieldCB_Rod(u8 taskId); -void ItemUseOnFieldCB_Itemfinder(u8 taskId); -void sub_80FD504(u8 taskId); -void sub_80FD5CC(u8 taskId); -void sub_80FDA94(u8 taskId); -void sub_80FDADC(u8 taskId); -void sub_80FD7C8(u8 taskId); -void sub_80FDC00(u8 taskId); -void ItemUseOnFieldCB_Berry(u8 taskId); -void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId); -void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId); +static void SetUpItemUseCallback(u8 taskId); +static void FieldCB_UseItemOnField(void); +static void Task_CallItemUseOnFieldCallback(u8 taskId); +static void Task_UseItemfinder(u8 taskId); +static void Task_CloseItemfinderMessage(u8 taskId); +static void Task_HiddenItemNearby(u8 taskId); +static void Task_StandingOnHiddenItem(u8 taskId); +static bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *, u8); +static u8 GetDirectionToHiddenItem(s16 distanceX, s16 distanceY); +static void PlayerFaceHiddenItem(u8 a); +static void CheckForHiddenItemsInMapConnection(u8 taskId); +static void sub_80FDC00(u8 taskId); +static void ItemUseOnFieldCB_Bike(u8 taskId); +static void ItemUseOnFieldCB_Rod(u8); +static void ItemUseOnFieldCB_Itemfinder(u8); +static void ItemUseOnFieldCB_Berry(u8 taskId); +static void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId); +static void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId); +static bool8 TryToWaterSudowoodo(void); static void BootUpSoundTMHM(u8 taskId); static void Task_ShowTMHMContainedMessage(u8 taskId); static void UseTMHMYesNo(u8 taskId); static void UseTMHM(u8 taskId); -void sub_80FE124(u8 taskId); -void sub_80FE164(u8 taskId); - -void DisplayItemMessage(u8 taskId, u8 a, const u8* str, void(*callback)(u8 taskId)); -void DisplayItemMessageOnField(u8 taskId, const u8* str, void(*callback)(u8 taskId)); -void sub_81C6714(u8 taskId); -void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId); -void StartFishing(u8 a); -bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *, u8); -u8 sub_80FD9B0(s16 a, s16 b); -void sub_80FDA24(u8 a); -void sub_80FD8E0(u8 taskId, s16 x, s16 y); -void sub_80FDBEC(void); -bool8 TryToWaterSudowoodo(void); -void ItemUseOutOfBattle_CannotUse(u8 taskId); +static void Task_StartUseRepel(u8 taskId); +static void Task_UseRepel(u8 taskId); +static void Task_CloseCantUseKeyItemMessage(u8 taskId); +static void SetDistanceOfClosestHiddenItem(u8 taskId, s16 x, s16 y); +static void CB2_OpenPokeblockCaseOnField(void); // EWRAM variables -EWRAM_DATA static void(*gUnknown_0203A0F4)(u8 taskId) = NULL; +EWRAM_DATA static void(*sItemUseOnFieldCB)(u8 taskId) = NULL; + +// Below is set TRUE by UseRegisteredKeyItemOnField +#define tUsingRegisteredKeyItem data[3] // .rodata @@ -96,7 +88,7 @@ static const MainCallback sItemUseCallbacks[] = NULL, }; -static const u8 gUnknown_085920E4[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; +static const u8 sClockwiseDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; static const struct YesNoFuncTable sUseTMHMYesNoFuncTable = { @@ -106,7 +98,7 @@ static const struct YesNoFuncTable sUseTMHMYesNoFuncTable = // .text -void SetUpItemUseCallback(u8 taskId) +static void SetUpItemUseCallback(u8 taskId) { u8 type; if (gSpecialVar_ItemId == ITEM_ENIGMA_BERRY) @@ -116,39 +108,39 @@ void SetUpItemUseCallback(u8 taskId) if (!InBattlePyramid()) { gBagMenu->mainCallback2 = sItemUseCallbacks[type]; - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); } else { gPyramidBagResources->callback2 = sItemUseCallbacks[type]; - sub_81C5B14(taskId); + CloseBattlePyramidBagAndSetCallback(taskId); } } -void SetUpItemUseOnFieldCallback(u8 taskId) +static void SetUpItemUseOnFieldCallback(u8 taskId) { - if (gTasks[taskId].data[3] != 1) + if (gTasks[taskId].tUsingRegisteredKeyItem != TRUE) { - gFieldCallback = MapPostLoadHook_UseItem; + gFieldCallback = FieldCB_UseItemOnField; SetUpItemUseCallback(taskId); } else - gUnknown_0203A0F4(taskId); + sItemUseOnFieldCB(taskId); } -void MapPostLoadHook_UseItem(void) +static void FieldCB_UseItemOnField(void) { FadeInFromBlack(); CreateTask(Task_CallItemUseOnFieldCallback, 8); } -void Task_CallItemUseOnFieldCallback(u8 taskId) +static void Task_CallItemUseOnFieldCallback(u8 taskId) { if (IsWeatherNotFadingIn() == 1) - gUnknown_0203A0F4(taskId); + sItemUseOnFieldCB(taskId); } -void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField, const u8 *str) +static void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField, const u8 *str) { StringExpandPlaceholders(gStringVar4, str); if (!isUsingRegisteredKeyItemOnField) @@ -156,23 +148,23 @@ void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnFiel if (!InBattlePyramid()) DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); else - DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, sub_81C6714); + DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, Task_CloseBattlePyramidBagMessage); } else - DisplayItemMessageOnField(taskId, gStringVar4, CleanUpAfterFailingToUseRegisteredKeyItemOnField); + DisplayItemMessageOnField(taskId, gStringVar4, Task_CloseCantUseKeyItemMessage); } -void DisplayDadsAdviceCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField) +static void DisplayDadsAdviceCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField) { DisplayCannotUseItemMessage(taskId, isUsingRegisteredKeyItemOnField, gText_DadsAdvice); } -void DisplayCannotDismountBikeMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField) +static void DisplayCannotDismountBikeMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField) { DisplayCannotUseItemMessage(taskId, isUsingRegisteredKeyItemOnField, gText_CantDismountBike); } -void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId) +static void Task_CloseCantUseKeyItemMessage(u8 taskId) { ClearDialogWindowAndFrame(0, 1); DestroyTask(taskId); @@ -190,17 +182,18 @@ u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId) return 0; } -void sub_80FD254(void) +// Mail in the bag menu can't have a message but it can be checked (view the mail background, no message) +static void CB2_CheckMail(void) { struct MailStruct mail; mail.itemId = gSpecialVar_ItemId; - ReadMail(&mail, bag_menu_mail_related, 0); + ReadMail(&mail, CB2_ReturnToBagMenuPocket, 0); } void ItemUseOutOfBattle_Mail(u8 taskId) { - gBagMenu->mainCallback2 = sub_80FD254; - unknown_ItemMenu_Confirm(taskId); + gBagMenu->mainCallback2 = CB2_CheckMail; + Task_FadeAndCloseBagMenu(taskId); } void ItemUseOutOfBattle_Bike(u8 taskId) @@ -212,20 +205,20 @@ void ItemUseOutOfBattle_Bike(u8 taskId) PlayerGetDestCoords(&coordsX, &coordsY); behavior = MapGridGetMetatileBehaviorAt(coordsX, coordsY); if (FlagGet(FLAG_SYS_CYCLING_ROAD) == TRUE || MetatileBehavior_IsVerticalRail(behavior) == TRUE || MetatileBehavior_IsHorizontalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE) - DisplayCannotDismountBikeMessage(taskId, data[3]); + DisplayCannotDismountBikeMessage(taskId, tUsingRegisteredKeyItem); else { if (Overworld_IsBikingAllowed() == TRUE && IsBikingDisallowedByPlayer() == 0) { - gUnknown_0203A0F4 = ItemUseOnFieldCB_Bike; + sItemUseOnFieldCB = ItemUseOnFieldCB_Bike; SetUpItemUseOnFieldCallback(taskId); } else - DisplayDadsAdviceCannotUseItemMessage(taskId, data[3]); + DisplayDadsAdviceCannotUseItemMessage(taskId, tUsingRegisteredKeyItem); } } -void ItemUseOnFieldCB_Bike(u8 taskId) +static void ItemUseOnFieldCB_Bike(u8 taskId) { if (!ItemId_GetSecondaryId(gSpecialVar_ItemId)) GetOnOffBike(2); @@ -236,7 +229,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId) DestroyTask(taskId); } -bool32 CanFish(void) +static bool32 CanFish(void) { s16 x, y; u16 tileBehavior; @@ -270,14 +263,14 @@ void ItemUseOutOfBattle_Rod(u8 taskId) { if (CanFish() == TRUE) { - gUnknown_0203A0F4 = ItemUseOnFieldCB_Rod; + sItemUseOnFieldCB = ItemUseOnFieldCB_Rod; SetUpItemUseOnFieldCallback(taskId); } else - DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]); + DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem); } -void ItemUseOnFieldCB_Rod(u8 taskId) +static void ItemUseOnFieldCB_Rod(u8 taskId) { StartFishing(ItemId_GetSecondaryId(gSpecialVar_ItemId)); DestroyTask(taskId); @@ -285,56 +278,65 @@ void ItemUseOnFieldCB_Rod(u8 taskId) void ItemUseOutOfBattle_Itemfinder(u8 var) { - IncrementGameStat(0x27); - gUnknown_0203A0F4 = ItemUseOnFieldCB_Itemfinder; + IncrementGameStat(GAME_STAT_USED_ITEMFINDER); + sItemUseOnFieldCB = ItemUseOnFieldCB_Itemfinder; SetUpItemUseOnFieldCallback(var); } -void ItemUseOnFieldCB_Itemfinder(u8 taskId) +static void ItemUseOnFieldCB_Itemfinder(u8 taskId) { if (ItemfinderCheckForHiddenItems(gMapHeader.events, taskId) == TRUE) - gTasks[taskId].func = sub_80FD504; + gTasks[taskId].func = Task_UseItemfinder; else - DisplayItemMessageOnField(taskId, gText_ItemFinderNothing, sub_80FD5CC); + DisplayItemMessageOnField(taskId, gText_ItemFinderNothing, Task_CloseItemfinderMessage); } -void sub_80FD504(u8 taskId) +// Define itemfinder task data +#define tItemDistanceX data[0] +#define tItemDistanceY data[1] +#define tItemFound data[2] +#define tCounter data[3] // Used to count delay between beeps and rotations during player spin +#define tItemfinderBeeps data[4] +#define tFacingDir data[5] + +static void Task_UseItemfinder(u8 taskId) { u8 playerDir; u8 playerDirToItem; u8 i; s16* data = gTasks[taskId].data; - if (!data[3]) + if (tCounter == 0) { - if (data[4] == 4) + if (tItemfinderBeeps == 4) { - playerDirToItem = sub_80FD9B0(data[0], data[1]); - if (playerDirToItem) + playerDirToItem = GetDirectionToHiddenItem(tItemDistanceX, tItemDistanceY); + if (playerDirToItem != DIR_NONE) { - sub_80FDA24(gUnknown_085920E4[playerDirToItem - 1]); - gTasks[taskId].func = sub_80FDA94; + PlayerFaceHiddenItem(sClockwiseDirections[playerDirToItem - 1]); + gTasks[taskId].func = Task_HiddenItemNearby; } else { + // Player is standing on hidden item playerDir = GetPlayerFacingDirection(); - for (i = 0; i < 4; i++) + for (i = 0; i < ARRAY_COUNT(sClockwiseDirections); i++) { - if (playerDir == gUnknown_085920E4[i]) - data[5] = (i + 1) & 3; + if (playerDir == sClockwiseDirections[i]) + tFacingDir = (i + 1) & 3; } - gTasks[taskId].func = sub_80FDADC; - data[3] = 0; - data[2] = 0; + gTasks[taskId].func = Task_StandingOnHiddenItem; + tCounter = 0; + tItemFound = 0; } return; } PlaySE(SE_DAUGI); - data[4]++; + tItemfinderBeeps++; } - data[3] = (data[3] + 1) & 0x1F; + tCounter = (tCounter + 1) & 0x1F; } -void sub_80FD5CC(u8 taskId) +static void Task_CloseItemfinderMessage(u8 taskId) { ClearDialogWindowAndFrame(0, 1); ScriptUnfreezeObjectEvents(); @@ -342,34 +344,36 @@ void sub_80FD5CC(u8 taskId) DestroyTask(taskId); } -bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *events, u8 taskId) +static bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *events, u8 taskId) { - int distanceX, distanceY; - s16 x, y, i, newDistanceX, newDistanceY; - PlayerGetDestCoords(&x, &y); - gTasks[taskId].data[2] = FALSE; + int itemX, itemY; + s16 playerX, playerY, i, distanceX, distanceY; + PlayerGetDestCoords(&playerX, &playerY); + gTasks[taskId].tItemFound = FALSE; + for (i = 0; i < events->bgEventCount; i++) { + // Check if there are any hidden items on the current map that haven't been picked up if (events->bgEvents[i].kind == BG_EVENT_HIDDEN_ITEM && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START)) { - distanceX = (u16)events->bgEvents[i].x + 7; - newDistanceX = distanceX - x; - distanceY = (u16)events->bgEvents[i].y + 7; - newDistanceY = distanceY - y; + itemX = (u16)events->bgEvents[i].x + 7; + distanceX = itemX - playerX; + itemY = (u16)events->bgEvents[i].y + 7; + distanceY = itemY - playerY; - if ((u16)(newDistanceX + 7) < 15 && (newDistanceY >= -5) && (newDistanceY < 6)) - sub_80FD8E0(taskId, newDistanceX, newDistanceY); + if ((u16)(distanceX + 7) < 15 && (distanceY >= -5) && (distanceY < 6)) + SetDistanceOfClosestHiddenItem(taskId, distanceX, distanceY); } } - sub_80FD7C8(taskId); - if (gTasks[taskId].data[2] == TRUE) + CheckForHiddenItemsInMapConnection(taskId); + if (gTasks[taskId].tItemFound == TRUE) return TRUE; else return FALSE; } -bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y) +static bool8 IsHiddenItemPresentAtCoords(const struct MapEvents *events, s16 x, s16 y) { u8 bgEventCount = events->bgEventCount; struct BgEvent *bgEvent = events->bgEvents; @@ -388,7 +392,7 @@ bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y) return FALSE; } -bool8 sub_80FD730(struct MapConnection *connection, int x, int y) +static bool8 IsHiddenItemPresentInConnection(struct MapConnection *connection, int x, int y) { u16 localX, localY; @@ -399,7 +403,7 @@ bool8 sub_80FD730(struct MapConnection *connection, int x, int y) switch (connection->direction) { - // same weird temp variable behavior seen in sub_80FD6D4 + // same weird temp variable behavior seen in IsHiddenItemPresentAtCoords case 2: localOffset = connection->offset + 7; localX = x - localOffset; @@ -427,136 +431,145 @@ bool8 sub_80FD730(struct MapConnection *connection, int x, int y) default: return FALSE; } - return sub_80FD6D4(mapHeader->events, localX, localY); + return IsHiddenItemPresentAtCoords(mapHeader->events, localX, localY); } -void sub_80FD7C8(u8 taskId) +static void CheckForHiddenItemsInMapConnection(u8 taskId) { + s16 playerX, playerY; s16 x, y; - s16 curX, curY; s16 width = gMapHeader.mapLayout->width + 7; s16 height = gMapHeader.mapLayout->height + 7; s16 var1 = 7; s16 var2 = 7; - PlayerGetDestCoords(&x, &y); + PlayerGetDestCoords(&playerX, &playerY); - for (curX = x - 7; curX <= x + 7; curX++) + for (x = playerX - 7; x <= playerX + 7; x++) { - for (curY = y - 5; curY <= y + 5; curY++) + for (y = playerY - 5; y <= playerY + 5; y++) { - if (var1 > curX - || curX >= width - || var2 > curY - || curY >= height) + if (var1 > x + || x >= width + || var2 > y + || y >= height) { - struct MapConnection *conn = sub_8088A8C(curX, curY); - if (conn && sub_80FD730(conn, curX, curY) == TRUE) - sub_80FD8E0(taskId, curX - x, curY - y); + struct MapConnection *conn = GetConnectionAtCoords(x, y); + if (conn && IsHiddenItemPresentInConnection(conn, x, y) == TRUE) + SetDistanceOfClosestHiddenItem(taskId, x - playerX, y - playerY); } } } } -void sub_80FD8E0(u8 taskId, s16 x, s16 y) +static void SetDistanceOfClosestHiddenItem(u8 taskId, s16 itemDistanceX, s16 itemDistanceY) { s16 *data = gTasks[taskId].data; - s16 var1, var2, var3, var4; + s16 oldItemAbsX, oldItemAbsY, newItemAbsX, newItemAbsY; - if (data[2] == FALSE) + if (tItemFound == FALSE) { - data[0] = x; - data[1] = y; - data[2] = TRUE; + // No other items found yet, set this one + tItemDistanceX = itemDistanceX; + tItemDistanceY = itemDistanceY; + tItemFound = TRUE; } else { - // data[0] and data[1] contain the player's coordinates. - // x and y contain the item's coordinates. - if (data[0] < 0) - var1 = data[0] * -1; // item is to the left - else - var1 = data[0]; // item is to the right + // Other items have been found, check if this one is closer - if (data[1] < 0) - var2 = data[1] * -1; // item is to the north + // Get absolute x distance of the already-found item + if (tItemDistanceX < 0) + oldItemAbsX = tItemDistanceX * -1; // WEST else - var2 = data[1]; // item is to the south + oldItemAbsX = tItemDistanceX; // EAST - if (x < 0) - var3 = x * -1; + // Get absolute y distance of the already-found item + if (tItemDistanceY < 0) + oldItemAbsY = tItemDistanceY * -1; // NORTH else - var3 = x; + oldItemAbsY = tItemDistanceY; // SOUTH - if (y < 0) - var4 = y * -1; + // Get absolute x distance of the newly-found item + if (itemDistanceX < 0) + newItemAbsX = itemDistanceX * -1; else - var4 = y; + newItemAbsX = itemDistanceX; - if (var1 + var2 > var3 + var4) + // Get absolute y distance of the newly-found item + if (itemDistanceY < 0) + newItemAbsY = itemDistanceY * -1; + else + newItemAbsY = itemDistanceY; + + + if (oldItemAbsX + oldItemAbsY > newItemAbsX + newItemAbsY) { - data[0] = x; - data[1] = y; + // New item is closer + tItemDistanceX = itemDistanceX; + tItemDistanceY = itemDistanceY; } else { - if (var1 + var2 == var3 + var4 && (var2 > var4 || (var2 == var4 && data[1] < y))) + if (oldItemAbsX + oldItemAbsY == newItemAbsX + newItemAbsY + && (oldItemAbsY > newItemAbsY || (oldItemAbsY == newItemAbsY && tItemDistanceY < itemDistanceY))) { - data[0] = x; - data[1] = y; + // If items are equal distance, use whichever is closer on the Y axis or further south + tItemDistanceX = itemDistanceX; + tItemDistanceY = itemDistanceY; } } } } -u8 sub_80FD9B0(s16 itemX, s16 itemY) +static u8 GetDirectionToHiddenItem(s16 itemDistanceX, s16 itemDistanceY) { - s16 abX, abY; + s16 absX, absY; - if (itemX == 0 && itemY == 0) + if (itemDistanceX == 0 && itemDistanceY == 0) return DIR_NONE; // player is standing on the item. - // get absolute X distance. - if (itemX < 0) - abX = itemX * -1; + // Get absolute X distance. + if (itemDistanceX < 0) + absX = itemDistanceX * -1; else - abX = itemX; + absX = itemDistanceX; - // get absolute Y distance. - if (itemY < 0) - abY = itemY * -1; + // Get absolute Y distance. + if (itemDistanceY < 0) + absY = itemDistanceY * -1; else - abY = itemY; + absY = itemDistanceY; - if (abX > abY) + if (absX > absY) { - if (itemX < 0) + if (itemDistanceX < 0) return DIR_EAST; else return DIR_NORTH; } else { - if (abX < abY) + if (absX < absY) { - if (itemY < 0) + if (itemDistanceY < 0) return DIR_SOUTH; else return DIR_WEST; } - if (abX == abY) + if (absX == absY) { - if (itemY < 0) + if (itemDistanceY < 0) return DIR_SOUTH; else return DIR_WEST; } - return DIR_NONE; // should never get here. return something so it doesnt crash. + return DIR_NONE; // Unreachable } } -void sub_80FDA24(u8 direction) +static void PlayerFaceHiddenItem(u8 direction) { ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); ObjectEventClearHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); @@ -564,39 +577,48 @@ void sub_80FDA24(u8 direction) PlayerTurnInPlace(direction); } -void sub_80FDA94(u8 taskId) +static void Task_HiddenItemNearby(u8 taskId) { if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]) == TRUE) - DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC); + DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, Task_CloseItemfinderMessage); } -void sub_80FDADC(u8 taskId) +static void Task_StandingOnHiddenItem(u8 taskId) { s16 *data = gTasks[taskId].data; if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]) == TRUE - || data[2] == FALSE) + || tItemFound == FALSE) { - sub_80FDA24(gUnknown_085920E4[data[5]]); - data[2] = 1; - data[5] = (data[5] + 1) & 3; - data[3]++; + // Spin player around on item + PlayerFaceHiddenItem(sClockwiseDirections[tFacingDir]); + tItemFound = TRUE; + tFacingDir = (tFacingDir + 1) & 3; + tCounter++; - if (data[3] == 4) - DisplayItemMessageOnField(taskId, gText_ItemFinderOnTop, sub_80FD5CC); + if (tCounter == 4) + DisplayItemMessageOnField(taskId, gText_ItemFinderOnTop, Task_CloseItemfinderMessage); } } +// Undefine itemfinder task data +#undef tItemDistanceX +#undef tItemDistanceY +#undef tItemFound +#undef tCounter +#undef tItemfinderBeeps +#undef tFacingDir + void ItemUseOutOfBattle_PokeblockCase(u8 taskId) { - if (sub_81221AC() == TRUE) + if (sub_81221AC() == TRUE) // link func { - DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]); + DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem); } - else if (gTasks[taskId].data[3] != TRUE) + else if (gTasks[taskId].tUsingRegisteredKeyItem != TRUE) { - gBagMenu->mainCallback2 = sub_80FDBEC; - unknown_ItemMenu_Confirm(taskId); + gBagMenu->mainCallback2 = CB2_OpenPokeblockCaseOnField; + Task_FadeAndCloseBagMenu(taskId); } else { @@ -606,17 +628,17 @@ void ItemUseOutOfBattle_PokeblockCase(u8 taskId) } } -void sub_80FDBEC(void) +static void CB2_OpenPokeblockCaseOnField(void) { - OpenPokeblockCase(0, bag_menu_mail_related); + OpenPokeblockCase(PBLOCK_CASE_FIELD, CB2_ReturnToBagMenuPocket); } -void sub_80FDC00(u8 taskId) +static void sub_80FDC00(u8 taskId) { if (!gPaletteFade.active) { CleanupOverworldWindowsAndTilemaps(); - OpenPokeblockCase(0, CB2_ReturnToField); + OpenPokeblockCase(PBLOCK_CASE_FIELD, CB2_ReturnToField); DestroyTask(taskId); } } @@ -626,13 +648,13 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId) ConvertIntToDecimalStringN(gStringVar1, GetCoins(), STR_CONV_MODE_LEFT_ALIGN, 4); StringExpandPlaceholders(gStringVar4, gText_CoinCase); - if (!gTasks[taskId].data[3]) + if (!gTasks[taskId].tUsingRegisteredKeyItem) { DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); } else { - DisplayItemMessageOnField(taskId, gStringVar4, CleanUpAfterFailingToUseRegisteredKeyItemOnField); + DisplayItemMessageOnField(taskId, gStringVar4, Task_CloseCantUseKeyItemMessage); } } @@ -641,13 +663,13 @@ void ItemUseOutOfBattle_PowderJar(u8 taskId) ConvertIntToDecimalStringN(gStringVar1, GetBerryPowder(), STR_CONV_MODE_LEFT_ALIGN, 5); StringExpandPlaceholders(gStringVar4, gText_PowderQty); - if (!gTasks[taskId].data[3]) + if (!gTasks[taskId].tUsingRegisteredKeyItem) { DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); } else { - DisplayItemMessageOnField(taskId, gStringVar4, CleanUpAfterFailingToUseRegisteredKeyItemOnField); + DisplayItemMessageOnField(taskId, gStringVar4, Task_CloseCantUseKeyItemMessage); } } @@ -655,10 +677,10 @@ void ItemUseOutOfBattle_Berry(u8 taskId) { if (IsPlayerFacingEmptyBerryTreePatch() == TRUE) { - gUnknown_0203A0F4 = ItemUseOnFieldCB_Berry; - gFieldCallback = MapPostLoadHook_UseItem; + sItemUseOnFieldCB = ItemUseOnFieldCB_Berry; + gFieldCallback = FieldCB_UseItemOnField; gBagMenu->mainCallback2 = CB2_ReturnToField; - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); } else { @@ -666,7 +688,7 @@ void ItemUseOutOfBattle_Berry(u8 taskId) } } -void ItemUseOnFieldCB_Berry(u8 taskId) +static void ItemUseOnFieldCB_Berry(u8 taskId) { RemoveBagItem(gSpecialVar_ItemId, 1); ScriptContext2_Enable(); @@ -678,28 +700,28 @@ void ItemUseOutOfBattle_WailmerPail(u8 taskId) { if (TryToWaterSudowoodo() == TRUE) { - gUnknown_0203A0F4 = ItemUseOnFieldCB_WailmerPailSudowoodo; + sItemUseOnFieldCB = ItemUseOnFieldCB_WailmerPailSudowoodo; SetUpItemUseOnFieldCallback(taskId); } else if (TryToWaterBerryTree() == TRUE) { - gUnknown_0203A0F4 = ItemUseOnFieldCB_WailmerPailBerry; + sItemUseOnFieldCB = ItemUseOnFieldCB_WailmerPailBerry; SetUpItemUseOnFieldCallback(taskId); } else { - DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]); + DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem); } } -void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId) +static void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId) { ScriptContext2_Enable(); ScriptContext1_SetupScript(BerryTree_EventScript_ItemUseWailmerPail); DestroyTask(taskId); } -bool8 TryToWaterSudowoodo(void) +static bool8 TryToWaterSudowoodo(void) { u16 x, y; u8 z; @@ -713,7 +735,7 @@ bool8 TryToWaterSudowoodo(void) return TRUE; } -void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId) +static void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId) { ScriptContext2_Enable(); ScriptContext1_SetupScript(BattleFrontier_OutsideEast_EventScript_WaterSudowoodo); @@ -791,14 +813,14 @@ static void UseTMHM(u8 taskId) SetUpItemUseCallback(taskId); } -void sub_80FE058(void) +static void RemoveUsedItem(void) { RemoveBagItem(gSpecialVar_ItemId, 1); CopyItemName(gSpecialVar_ItemId, gStringVar2); StringExpandPlaceholders(gStringVar4, gText_PlayerUsedVar2); if (!InBattlePyramid()) { - sub_81AB9A8(ItemId_GetPocket(gSpecialVar_ItemId)); + UpdatePocketItemList(ItemId_GetPocket(gSpecialVar_ItemId)); SetInitialScrollAndCursorPositions(ItemId_GetPocket(gSpecialVar_ItemId)); } else @@ -811,14 +833,14 @@ void sub_80FE058(void) void ItemUseOutOfBattle_Repel(u8 taskId) { if (VarGet(VAR_REPEL_STEP_COUNT) == 0) - gTasks[taskId].func = sub_80FE124; + gTasks[taskId].func = Task_StartUseRepel; else if (!InBattlePyramid()) DisplayItemMessage(taskId, 1, gText_RepelEffectsLingered, BagMenu_InitListsMenu); else - DisplayItemMessageInBattlePyramid(taskId, gText_RepelEffectsLingered, sub_81C6714); + DisplayItemMessageInBattlePyramid(taskId, gText_RepelEffectsLingered, Task_CloseBattlePyramidBagMessage); } -void sub_80FE124(u8 taskId) +static void Task_StartUseRepel(u8 taskId) { s16* data = gTasks[taskId].data; @@ -826,24 +848,24 @@ void sub_80FE124(u8 taskId) { data[8] = 0; PlaySE(SE_TU_SAA); - gTasks[taskId].func = sub_80FE164; + gTasks[taskId].func = Task_UseRepel; } } -void sub_80FE164(u8 taskId) +static void Task_UseRepel(u8 taskId) { if (!IsSEPlaying()) { VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId)); - sub_80FE058(); + RemoveUsedItem(); if (!InBattlePyramid()) DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); else - DisplayItemMessageInBattlePyramid(taskId, gStringVar4, sub_81C6714); + DisplayItemMessageInBattlePyramid(taskId, gStringVar4, Task_CloseBattlePyramidBagMessage); } } -void sub_80FE1D0(u8 taskId) +static void Task_UsedBlackWhiteFlute(u8 taskId) { if(++gTasks[taskId].data[8] > 7) { @@ -851,7 +873,7 @@ void sub_80FE1D0(u8 taskId) if (!InBattlePyramid()) DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu); else - DisplayItemMessageInBattlePyramid(taskId, gStringVar4, sub_81C6714); + DisplayItemMessageInBattlePyramid(taskId, gStringVar4, Task_CloseBattlePyramidBagMessage); } } @@ -871,27 +893,27 @@ void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId) StringExpandPlaceholders(gStringVar4, gText_UsedVar2WildRepelled); } gTasks[taskId].data[8] = 0; - gTasks[taskId].func = sub_80FE1D0; + gTasks[taskId].func = Task_UsedBlackWhiteFlute; } -void task08_080A1C44(u8 taskId) +void Task_UseDigEscapeRopeOnField(u8 taskId) { ResetInitialPlayerAvatarState(); StartEscapeRopeFieldEffect(); DestroyTask(taskId); } -void re_escape_rope(u8 taskId) +static void ItemUseOnFieldCB_EscapeRope(u8 taskId) { Overworld_ResetStateAfterDigEscRope(); - sub_80FE058(); + RemoveUsedItem(); gTasks[taskId].data[0] = 0; - DisplayItemMessageOnField(taskId, gStringVar4, task08_080A1C44); + DisplayItemMessageOnField(taskId, gStringVar4, Task_UseDigEscapeRopeOnField); } bool8 CanUseEscapeRopeOnCurrMap(void) { - if (gMapHeader.flags & 2) + if (gMapHeader.flags & MAP_ALLOW_ESCAPE_ROPE) return TRUE; else return FALSE; @@ -901,12 +923,12 @@ void ItemUseOutOfBattle_EscapeRope(u8 taskId) { if (CanUseEscapeRopeOnCurrMap() == TRUE) { - gUnknown_0203A0F4 = re_escape_rope; + sItemUseOnFieldCB = ItemUseOnFieldCB_EscapeRope; SetUpItemUseOnFieldCallback(taskId); } else { - DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]); + DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem); } } @@ -922,42 +944,43 @@ void ItemUseInBattle_PokeBall(u8 taskId) { RemoveBagItem(gSpecialVar_ItemId, 1); if (!InBattlePyramid()) - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); else - sub_81C5B14(taskId); + CloseBattlePyramidBagAndSetCallback(taskId); } else if (!InBattlePyramid()) { DisplayItemMessage(taskId, 1, gText_BoxFull, BagMenu_InitListsMenu); } else - DisplayItemMessageInBattlePyramid(taskId, gText_BoxFull, sub_81C6714); + DisplayItemMessageInBattlePyramid(taskId, gText_BoxFull, Task_CloseBattlePyramidBagMessage); } -void sub_80FE408(u8 taskId) +static void Task_CloseStatIncreaseMessage(u8 taskId) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { if (!InBattlePyramid()) - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); else - sub_81C5B14(taskId); + CloseBattlePyramidBagAndSetCallback(taskId); } } -void sub_80FE440(u8 taskId) +static void Task_UseStatIncreaseItem(u8 taskId) { if(++gTasks[taskId].data[8] > 7) { PlaySE(SE_KAIFUKU); RemoveBagItem(gSpecialVar_ItemId, 1); if (!InBattlePyramid()) - DisplayItemMessage(taskId, 1, sub_806CF78(gSpecialVar_ItemId), sub_80FE408); + DisplayItemMessage(taskId, 1, UseStatIncreaseItem(gSpecialVar_ItemId), Task_CloseStatIncreaseMessage); else - DisplayItemMessageInBattlePyramid(taskId, sub_806CF78(gSpecialVar_ItemId), sub_80FE408); + DisplayItemMessageInBattlePyramid(taskId, UseStatIncreaseItem(gSpecialVar_ItemId), Task_CloseStatIncreaseMessage); } } +// e.g. X Attack, Guard Spec void ItemUseInBattle_StatIncrease(u8 taskId) { u16 partyId = gBattlerPartyIndexes[gBattlerInMenuId]; @@ -967,11 +990,11 @@ void ItemUseInBattle_StatIncrease(u8 taskId) if (!InBattlePyramid()) DisplayItemMessage(taskId, 1, gText_WontHaveEffect, BagMenu_InitListsMenu); else - DisplayItemMessageInBattlePyramid(taskId, gText_WontHaveEffect, sub_81C6714); + DisplayItemMessageInBattlePyramid(taskId, gText_WontHaveEffect, Task_CloseBattlePyramidBagMessage); } else { - gTasks[taskId].func = sub_80FE440; + gTasks[taskId].func = Task_UseStatIncreaseItem; gTasks[taskId].data[8] = 0; } } @@ -981,12 +1004,12 @@ static void ItemUseInBattle_ShowPartyMenu(u8 taskId) if (!InBattlePyramid()) { gBagMenu->mainCallback2 = ChooseMonForInBattleItem; - unknown_ItemMenu_Confirm(taskId); + Task_FadeAndCloseBagMenu(taskId); } else { gPyramidBagResources->callback2 = ChooseMonForInBattleItem; - sub_81C5B14(taskId); + CloseBattlePyramidBagAndSetCallback(taskId); } } @@ -1009,20 +1032,21 @@ void ItemUseInBattle_PPRecovery(u8 taskId) ItemUseInBattle_ShowPartyMenu(taskId); } +// Fluffy Tail / Poke Doll void ItemUseInBattle_Escape(u8 taskId) { if((gBattleTypeFlags & BATTLE_TYPE_TRAINER) == FALSE) { - sub_80FE058(); + RemoveUsedItem(); if (!InBattlePyramid()) - DisplayItemMessage(taskId, 1, gStringVar4, unknown_ItemMenu_Confirm); + DisplayItemMessage(taskId, 1, gStringVar4, Task_FadeAndCloseBagMenu); else - DisplayItemMessageInBattlePyramid(taskId, gStringVar4, sub_81C5B14); + DisplayItemMessageInBattlePyramid(taskId, gStringVar4, CloseBattlePyramidBagAndSetCallback); } else { - DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]); + DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem); } } @@ -1099,5 +1123,7 @@ void ItemUseInBattle_EnigmaBerry(u8 taskId) void ItemUseOutOfBattle_CannotUse(u8 taskId) { - DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]); + DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem); } + +#undef tUsingRegisteredKeyItem diff --git a/src/overworld.c b/src/overworld.c index 47bb278bff..fdccc35219 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -978,7 +978,7 @@ static u16 GetCenterScreenMetatileBehavior(void) bool32 Overworld_IsBikingAllowed(void) { - if (!(gMapHeader.flags & 1)) + if (!(gMapHeader.flags & MAP_ALLOW_BIKE)) return FALSE; else return TRUE; @@ -1702,7 +1702,7 @@ void sub_80861E8(void) static void sub_8086204(void) { - if ((gMapHeader.flags & 0xF8) == 8 && SecretBaseMapPopupEnabled() == TRUE) + if (SHOW_MAP_NAME_ENABLED && SecretBaseMapPopupEnabled() == TRUE) ShowMapNamePopup(); FieldCB_WarpExitFadeFromBlack(); } @@ -1948,7 +1948,7 @@ static bool32 load_map_stuff(u8 *state, u32 a2) (*state)++; break; case 11: - if ((gMapHeader.flags & 0xF8) == 8 && SecretBaseMapPopupEnabled() == TRUE) + if (SHOW_MAP_NAME_ENABLED && SecretBaseMapPopupEnabled() == TRUE) ShowMapNamePopup(); (*state)++; break; diff --git a/src/party_menu.c b/src/party_menu.c index 367e842954..bc4cf8c0bc 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2572,7 +2572,7 @@ static u8 GetPartyMenuActionsType(struct Pokemon *mon) switch (gPartyMenu.menuType) { case PARTY_MENU_TYPE_FIELD: - if (InMultiBattleRoom() == TRUE || GetMonData(mon, MON_DATA_IS_EGG)) + if (InMultiPartnerRoom() == TRUE || GetMonData(mon, MON_DATA_IS_EGG)) actionType = ACTIONS_SWITCH; else actionType = ACTIONS_NONE; // actions populated by SetPartyMonFieldSelectionActions @@ -5186,7 +5186,7 @@ u8 GetItemEffectType(u16 item) else itemEffect = gItemEffectTable[item - ITEM_POTION]; - if ((itemEffect[0] & (ITEM0_HIGH_CRIT | ITEM0_X_ATTACK)) || itemEffect[1] || itemEffect[2] || (itemEffect[3] & ITEM3_MIST)) + if ((itemEffect[0] & (ITEM0_DIRE_HIT | ITEM0_X_ATTACK)) || itemEffect[1] || itemEffect[2] || (itemEffect[3] & ITEM3_GUARD_SPEC)) return ITEM_EFFECT_X_ITEM; else if (itemEffect[0] & ITEM0_SACRED_ASH) return ITEM_EFFECT_SACRED_ASH; diff --git a/src/pokeblock.c b/src/pokeblock.c index 342221880e..b9031e1730 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -451,7 +451,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void)) sPokeblockMenu->pokeblockOptionsIds = sActionsWhenGivingToLady; sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsWhenGivingToLady); break; - default: + default: // PBLOCK_CASE_FIELD sPokeblockMenu->pokeblockOptionsIds = sActionsOnField; sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsOnField); break; diff --git a/src/pokemon.c b/src/pokemon.c index 12820aa76e..15427e6ea8 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2043,7 +2043,8 @@ static const u8 sGetMonDataEVConstants[] = MON_DATA_SPATK_EV }; -static const u8 gUnknown_08329EC8[] = +// For stat-raising items +static const u8 sStatsToRaise[] = { STAT_ATK, STAT_ATK, STAT_SPEED, STAT_DEF, STAT_SPATK, STAT_ACC }; @@ -4691,7 +4692,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov gBattleMons[battlerId].status2 &= ~STATUS2_INFATUATION; retVal = FALSE; } - if ((itemEffect[cmdIndex] & ITEM0_HIGH_CRIT) + if ((itemEffect[cmdIndex] & ITEM0_DIRE_HIT) && !(gBattleMons[gActiveBattler].status2 & STATUS2_FOCUS_ENERGY)) { gBattleMons[gActiveBattler].status2 |= STATUS2_FOCUS_ENERGY; @@ -4745,7 +4746,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov } break; case 3: - if ((itemEffect[cmdIndex] & ITEM3_MIST) + if ((itemEffect[cmdIndex] & ITEM3_GUARD_SPEC) && gSideTimers[GetBattlerSide(gActiveBattler)].mistTimer == 0) { gSideTimers[GetBattlerSide(gActiveBattler)].mistTimer = 5; @@ -5285,15 +5286,15 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit) return offset; } -static void sub_806CF24(s32 arg0) +static void BufferStatRoseMessage(s32 arg0) { gBattlerTarget = gBattlerInMenuId; - StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_08329EC8[arg0]]); + StringCopy(gBattleTextBuff1, gStatNamesTable[sStatsToRaise[arg0]]); StringCopy(gBattleTextBuff2, gText_StatRose); BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2); } -u8 *sub_806CF78(u16 itemId) +u8 *UseStatIncreaseItem(u16 itemId) { int i; const u8 *itemEffect; @@ -5314,13 +5315,14 @@ u8 *sub_806CF78(u16 itemId) for (i = 0; i < 3; i++) { - if (itemEffect[i] & 0xF) - sub_806CF24(i * 2); - if (itemEffect[i] & 0xF0) + if (itemEffect[i] & (ITEM0_X_ATTACK | ITEM1_X_SPEED | ITEM2_X_SPATK)) + BufferStatRoseMessage(i * 2); + + if (itemEffect[i] & (ITEM0_DIRE_HIT | ITEM1_X_DEFEND | ITEM2_X_ACCURACY)) { - if (i) + if (i != 0) // Dire Hit is the only ITEM0 above { - sub_806CF24(i * 2 + 1); + BufferStatRoseMessage(i * 2 + 1); } else { @@ -5330,7 +5332,7 @@ u8 *sub_806CF78(u16 itemId) } } - if (itemEffect[3] & ITEM3_MIST) + if (itemEffect[3] & ITEM3_GUARD_SPEC) { gBattlerAttacker = gBattlerInMenuId; BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnShroudedInMist); diff --git a/src/region_map.c b/src/region_map.c index 75ce60056c..5694d4c7a8 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -997,7 +997,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) break; case MAP_TYPE_UNDERGROUND: case MAP_TYPE_UNUSED_2: - if (gMapHeader.flags & 0x02) + if (gMapHeader.flags & MAP_ALLOW_ESCAPE_ROPE) { mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; diff --git a/src/secret_base.c b/src/secret_base.c index 0c67c95968..8f954c6e85 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -16,6 +16,7 @@ #include "fldeff.h" #include "fldeff_misc.h" #include "international_string_util.h" +#include "item_menu.h" #include "link.h" #include "list_menu.h" #include "main.h" diff --git a/src/start_menu.c b/src/start_menu.c index e13fc4b26c..8aacd80655 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -201,7 +201,7 @@ static void BuildLinkModeStartMenu(void); static void BuildUnionRoomStartMenu(void); static void BuildBattlePikeStartMenu(void); static void BuildBattlePyramidStartMenu(void); -static void BuildMultiBattleRoomStartMenu(void); +static void BuildMultiPartnerRoomStartMenu(void); static void ShowSafariBallsWindow(void); static void ShowPyramidFloorWindow(void); static void RemoveExtraStartMenuWindows(void); @@ -256,9 +256,9 @@ static void BuildStartMenuActions(void) { BuildBattlePyramidStartMenu(); } - else if (InMultiBattleRoom()) + else if (InMultiPartnerRoom()) { - BuildMultiBattleRoomStartMenu(); + BuildMultiPartnerRoomStartMenu(); } else { @@ -356,7 +356,7 @@ static void BuildBattlePyramidStartMenu(void) AddStartMenuAction(MENU_ACTION_EXIT); } -static void BuildMultiBattleRoomStartMenu(void) +static void BuildMultiPartnerRoomStartMenu(void) { AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_PLAYER); From 49421a41b2b28c167f6fca8287361f23e6bd00a9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 12 Feb 2020 17:32:51 -0600 Subject: [PATCH 12/13] Move field effects data and graphics into own directory, and cleanup naming for object events --- .../palettes/00.pal} | 0 .../palettes/01.pal} | 0 .../palettes/02.pal} | 0 .../palettes/03.pal} | 0 .../palettes/04.pal} | 0 .../palettes/05.pal} | 0 .../palettes/06.pal} | 0 .../palettes/07.pal} | 0 .../palettes/08.pal} | 0 .../palettes/10.pal} | 0 .../effects => field_effects/pics}/arrow.png | Bin .../effects => field_effects/pics}/ash.png | Bin .../pics}/berry_tree_growth_sparkle.png | Bin .../pics}/bike_hop_big_splash.png | Bin .../pics}/bike_hop_small_splash.png | Bin .../pics}/bike_hop_tall_grass.png | Bin .../pics}/bike_tire_tracks.png | Bin .../effects => field_effects/pics}/bird.png | Bin .../pics}/bubbles.png | Bin .../pics}/cut_grass.png | Bin .../pics}/deep_sand_footprints.png | Bin .../pics}/ground_impact_dust.png | Bin .../pics}/hot_springs_water.png | Bin .../pics}/jump_out_of_ash.png | Bin .../pics}/lavaridge_gym_warp.png | Bin .../pics}/long_grass.png | Bin .../pics}/mountain_disguise.png | Bin .../effects => field_effects/pics}/ripple.png | Bin .../pics}/sand_disguise_placeholder.png | Bin .../pics}/sand_footprints.png | Bin .../pics}/shadow_extra_large.png | Bin .../pics}/shadow_large.png | Bin .../pics}/shadow_medium.png | Bin .../pics}/shadow_small.png | Bin .../pics}/short_grass.png | Bin .../effects => field_effects/pics}/splash.png | Bin .../pics}/surf_blob.png | Bin .../pics}/tall_grass.png | Bin .../pics}/tree_disguise.png | Bin .../pics}/unknown_16.png | Bin .../pics}/unknown_17.png | Bin .../pics}/unknown_18.png | Bin .../pics}/unknown_19.png | Bin .../pics}/unknown_20.png | Bin .../pics}/unknown_29.png | Bin .../pics}/unknown_35.png | Bin .../pics}/unused_grass.png | Bin .../{event_object_palette_00.pal => 00.pal} | 0 .../{event_object_palette_01.pal => 01.pal} | 0 .../{event_object_palette_02.pal => 02.pal} | 0 .../{event_object_palette_03.pal => 03.pal} | 0 .../{event_object_palette_04.pal => 04.pal} | 0 .../{event_object_palette_05.pal => 05.pal} | 0 .../{event_object_palette_06.pal => 06.pal} | 0 .../{event_object_palette_07.pal => 07.pal} | 0 .../{event_object_palette_08.pal => 08.pal} | 0 .../{event_object_palette_09.pal => 09.pal} | 0 .../{event_object_palette_10.pal => 10.pal} | 0 .../{event_object_palette_11.pal => 11.pal} | 0 .../{event_object_palette_12.pal => 12.pal} | 0 .../{event_object_palette_13.pal => 13.pal} | 0 .../{event_object_palette_14.pal => 14.pal} | 0 .../{event_object_palette_15.pal => 15.pal} | 0 .../{event_object_palette_16.pal => 16.pal} | 0 .../{event_object_palette_17.pal => 17.pal} | 0 .../{event_object_palette_18.pal => 18.pal} | 0 .../{event_object_palette_19.pal => 19.pal} | 0 .../{event_object_palette_20.pal => 20.pal} | 0 .../{event_object_palette_21.pal => 21.pal} | 0 .../{event_object_palette_22.pal => 22.pal} | 0 .../{event_object_palette_23.pal => 23.pal} | 0 .../{event_object_palette_24.pal => 24.pal} | 0 .../{event_object_palette_25.pal => 25.pal} | 0 .../{event_object_palette_26.pal => 26.pal} | 0 .../{event_object_palette_27.pal => 27.pal} | 0 .../{event_object_palette_28.pal => 28.pal} | 0 .../{event_object_palette_29.pal => 29.pal} | 0 .../{event_object_palette_30.pal => 30.pal} | 0 .../{event_object_palette_31.pal => 31.pal} | 0 .../{event_object_palette_32.pal => 32.pal} | 0 .../{event_object_palette_33.pal => 33.pal} | 0 .../{event_object_palette_34.pal => 34.pal} | 0 src/battle_transition.c | 2 +- .../field_effect_object_template_pointers.h | 0 .../field_effect_objects.h | 0 .../base_oam.h | 0 .../berry_tree_graphics_tables.h | 0 .../movement_action_func_tables.h | 0 .../movement_type_func_tables.h | 0 .../object_event_anims.h} | 0 .../object_event_graphics.h} | 156 +++++++++--------- .../object_event_graphics_info.h} | 0 .../object_event_graphics_info_pointers.h} | 0 .../object_event_pic_tables.h} | 0 .../object_event_subsprites.h} | 0 src/event_object_movement.c | 24 +-- src/field_effect.c | 4 +- src/fldeff_misc.c | 6 +- 98 files changed, 96 insertions(+), 96 deletions(-) rename graphics/{object_events/palettes/field_effect_object_palette_00.pal => field_effects/palettes/00.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_01.pal => field_effects/palettes/01.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_02.pal => field_effects/palettes/02.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_03.pal => field_effects/palettes/03.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_04.pal => field_effects/palettes/04.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_05.pal => field_effects/palettes/05.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_06.pal => field_effects/palettes/06.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_07.pal => field_effects/palettes/07.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_08.pal => field_effects/palettes/08.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_10.pal => field_effects/palettes/10.pal} (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/arrow.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/ash.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/berry_tree_growth_sparkle.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bike_hop_big_splash.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bike_hop_small_splash.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bike_hop_tall_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bike_tire_tracks.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bird.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bubbles.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/cut_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/deep_sand_footprints.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/ground_impact_dust.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/hot_springs_water.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/jump_out_of_ash.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/lavaridge_gym_warp.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/long_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/mountain_disguise.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/ripple.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/sand_disguise_placeholder.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/sand_footprints.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_extra_large.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_large.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_medium.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_small.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/short_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/splash.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/surf_blob.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/tall_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/tree_disguise.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_16.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_17.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_18.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_19.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_20.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_29.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_35.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unused_grass.png (100%) rename graphics/object_events/palettes/{event_object_palette_00.pal => 00.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_01.pal => 01.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_02.pal => 02.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_03.pal => 03.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_04.pal => 04.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_05.pal => 05.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_06.pal => 06.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_07.pal => 07.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_08.pal => 08.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_09.pal => 09.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_10.pal => 10.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_11.pal => 11.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_12.pal => 12.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_13.pal => 13.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_14.pal => 14.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_15.pal => 15.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_16.pal => 16.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_17.pal => 17.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_18.pal => 18.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_19.pal => 19.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_20.pal => 20.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_21.pal => 21.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_22.pal => 22.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_23.pal => 23.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_24.pal => 24.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_25.pal => 25.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_26.pal => 26.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_27.pal => 27.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_28.pal => 28.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_29.pal => 29.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_30.pal => 30.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_31.pal => 31.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_32.pal => 32.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_33.pal => 33.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_34.pal => 34.pal} (100%) rename src/data/{object_event => field_effects}/field_effect_object_template_pointers.h (100%) rename src/data/{object_event => field_effects}/field_effect_objects.h (100%) rename src/data/{object_event => object_events}/base_oam.h (100%) rename src/data/{object_event => object_events}/berry_tree_graphics_tables.h (100%) rename src/data/{object_event => object_events}/movement_action_func_tables.h (100%) rename src/data/{object_event => object_events}/movement_type_func_tables.h (100%) rename src/data/{object_event/event_object_anims.h => object_events/object_event_anims.h} (100%) rename src/data/{object_event/event_object_graphics.h => object_events/object_event_graphics.h} (87%) rename src/data/{object_event/event_object_graphics_info.h => object_events/object_event_graphics_info.h} (100%) rename src/data/{object_event/event_object_graphics_info_pointers.h => object_events/object_event_graphics_info_pointers.h} (100%) rename src/data/{object_event/event_object_pic_tables.h => object_events/object_event_pic_tables.h} (100%) rename src/data/{object_event/event_object_subsprites.h => object_events/object_event_subsprites.h} (100%) diff --git a/graphics/object_events/palettes/field_effect_object_palette_00.pal b/graphics/field_effects/palettes/00.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_00.pal rename to graphics/field_effects/palettes/00.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_01.pal b/graphics/field_effects/palettes/01.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_01.pal rename to graphics/field_effects/palettes/01.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_02.pal b/graphics/field_effects/palettes/02.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_02.pal rename to graphics/field_effects/palettes/02.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_03.pal b/graphics/field_effects/palettes/03.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_03.pal rename to graphics/field_effects/palettes/03.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_04.pal b/graphics/field_effects/palettes/04.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_04.pal rename to graphics/field_effects/palettes/04.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_05.pal b/graphics/field_effects/palettes/05.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_05.pal rename to graphics/field_effects/palettes/05.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_06.pal b/graphics/field_effects/palettes/06.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_06.pal rename to graphics/field_effects/palettes/06.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_07.pal b/graphics/field_effects/palettes/07.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_07.pal rename to graphics/field_effects/palettes/07.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_08.pal b/graphics/field_effects/palettes/08.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_08.pal rename to graphics/field_effects/palettes/08.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_10.pal b/graphics/field_effects/palettes/10.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_10.pal rename to graphics/field_effects/palettes/10.pal diff --git a/graphics/object_events/pics/effects/arrow.png b/graphics/field_effects/pics/arrow.png similarity index 100% rename from graphics/object_events/pics/effects/arrow.png rename to graphics/field_effects/pics/arrow.png diff --git a/graphics/object_events/pics/effects/ash.png b/graphics/field_effects/pics/ash.png similarity index 100% rename from graphics/object_events/pics/effects/ash.png rename to graphics/field_effects/pics/ash.png diff --git a/graphics/object_events/pics/effects/berry_tree_growth_sparkle.png b/graphics/field_effects/pics/berry_tree_growth_sparkle.png similarity index 100% rename from graphics/object_events/pics/effects/berry_tree_growth_sparkle.png rename to graphics/field_effects/pics/berry_tree_growth_sparkle.png diff --git a/graphics/object_events/pics/effects/bike_hop_big_splash.png b/graphics/field_effects/pics/bike_hop_big_splash.png similarity index 100% rename from graphics/object_events/pics/effects/bike_hop_big_splash.png rename to graphics/field_effects/pics/bike_hop_big_splash.png diff --git a/graphics/object_events/pics/effects/bike_hop_small_splash.png b/graphics/field_effects/pics/bike_hop_small_splash.png similarity index 100% rename from graphics/object_events/pics/effects/bike_hop_small_splash.png rename to graphics/field_effects/pics/bike_hop_small_splash.png diff --git a/graphics/object_events/pics/effects/bike_hop_tall_grass.png b/graphics/field_effects/pics/bike_hop_tall_grass.png similarity index 100% rename from graphics/object_events/pics/effects/bike_hop_tall_grass.png rename to graphics/field_effects/pics/bike_hop_tall_grass.png diff --git a/graphics/object_events/pics/effects/bike_tire_tracks.png b/graphics/field_effects/pics/bike_tire_tracks.png similarity index 100% rename from graphics/object_events/pics/effects/bike_tire_tracks.png rename to graphics/field_effects/pics/bike_tire_tracks.png diff --git a/graphics/object_events/pics/effects/bird.png b/graphics/field_effects/pics/bird.png similarity index 100% rename from graphics/object_events/pics/effects/bird.png rename to graphics/field_effects/pics/bird.png diff --git a/graphics/object_events/pics/effects/bubbles.png b/graphics/field_effects/pics/bubbles.png similarity index 100% rename from graphics/object_events/pics/effects/bubbles.png rename to graphics/field_effects/pics/bubbles.png diff --git a/graphics/object_events/pics/effects/cut_grass.png b/graphics/field_effects/pics/cut_grass.png similarity index 100% rename from graphics/object_events/pics/effects/cut_grass.png rename to graphics/field_effects/pics/cut_grass.png diff --git a/graphics/object_events/pics/effects/deep_sand_footprints.png b/graphics/field_effects/pics/deep_sand_footprints.png similarity index 100% rename from graphics/object_events/pics/effects/deep_sand_footprints.png rename to graphics/field_effects/pics/deep_sand_footprints.png diff --git a/graphics/object_events/pics/effects/ground_impact_dust.png b/graphics/field_effects/pics/ground_impact_dust.png similarity index 100% rename from graphics/object_events/pics/effects/ground_impact_dust.png rename to graphics/field_effects/pics/ground_impact_dust.png diff --git a/graphics/object_events/pics/effects/hot_springs_water.png b/graphics/field_effects/pics/hot_springs_water.png similarity index 100% rename from graphics/object_events/pics/effects/hot_springs_water.png rename to graphics/field_effects/pics/hot_springs_water.png diff --git a/graphics/object_events/pics/effects/jump_out_of_ash.png b/graphics/field_effects/pics/jump_out_of_ash.png similarity index 100% rename from graphics/object_events/pics/effects/jump_out_of_ash.png rename to graphics/field_effects/pics/jump_out_of_ash.png diff --git a/graphics/object_events/pics/effects/lavaridge_gym_warp.png b/graphics/field_effects/pics/lavaridge_gym_warp.png similarity index 100% rename from graphics/object_events/pics/effects/lavaridge_gym_warp.png rename to graphics/field_effects/pics/lavaridge_gym_warp.png diff --git a/graphics/object_events/pics/effects/long_grass.png b/graphics/field_effects/pics/long_grass.png similarity index 100% rename from graphics/object_events/pics/effects/long_grass.png rename to graphics/field_effects/pics/long_grass.png diff --git a/graphics/object_events/pics/effects/mountain_disguise.png b/graphics/field_effects/pics/mountain_disguise.png similarity index 100% rename from graphics/object_events/pics/effects/mountain_disguise.png rename to graphics/field_effects/pics/mountain_disguise.png diff --git a/graphics/object_events/pics/effects/ripple.png b/graphics/field_effects/pics/ripple.png similarity index 100% rename from graphics/object_events/pics/effects/ripple.png rename to graphics/field_effects/pics/ripple.png diff --git a/graphics/object_events/pics/effects/sand_disguise_placeholder.png b/graphics/field_effects/pics/sand_disguise_placeholder.png similarity index 100% rename from graphics/object_events/pics/effects/sand_disguise_placeholder.png rename to graphics/field_effects/pics/sand_disguise_placeholder.png diff --git a/graphics/object_events/pics/effects/sand_footprints.png b/graphics/field_effects/pics/sand_footprints.png similarity index 100% rename from graphics/object_events/pics/effects/sand_footprints.png rename to graphics/field_effects/pics/sand_footprints.png diff --git a/graphics/object_events/pics/effects/shadow_extra_large.png b/graphics/field_effects/pics/shadow_extra_large.png similarity index 100% rename from graphics/object_events/pics/effects/shadow_extra_large.png rename to graphics/field_effects/pics/shadow_extra_large.png diff --git a/graphics/object_events/pics/effects/shadow_large.png b/graphics/field_effects/pics/shadow_large.png similarity index 100% rename from graphics/object_events/pics/effects/shadow_large.png rename to graphics/field_effects/pics/shadow_large.png diff --git a/graphics/object_events/pics/effects/shadow_medium.png b/graphics/field_effects/pics/shadow_medium.png similarity index 100% rename from graphics/object_events/pics/effects/shadow_medium.png rename to graphics/field_effects/pics/shadow_medium.png diff --git a/graphics/object_events/pics/effects/shadow_small.png b/graphics/field_effects/pics/shadow_small.png similarity index 100% rename from graphics/object_events/pics/effects/shadow_small.png rename to graphics/field_effects/pics/shadow_small.png diff --git a/graphics/object_events/pics/effects/short_grass.png b/graphics/field_effects/pics/short_grass.png similarity index 100% rename from graphics/object_events/pics/effects/short_grass.png rename to graphics/field_effects/pics/short_grass.png diff --git a/graphics/object_events/pics/effects/splash.png b/graphics/field_effects/pics/splash.png similarity index 100% rename from graphics/object_events/pics/effects/splash.png rename to graphics/field_effects/pics/splash.png diff --git a/graphics/object_events/pics/effects/surf_blob.png b/graphics/field_effects/pics/surf_blob.png similarity index 100% rename from graphics/object_events/pics/effects/surf_blob.png rename to graphics/field_effects/pics/surf_blob.png diff --git a/graphics/object_events/pics/effects/tall_grass.png b/graphics/field_effects/pics/tall_grass.png similarity index 100% rename from graphics/object_events/pics/effects/tall_grass.png rename to graphics/field_effects/pics/tall_grass.png diff --git a/graphics/object_events/pics/effects/tree_disguise.png b/graphics/field_effects/pics/tree_disguise.png similarity index 100% rename from graphics/object_events/pics/effects/tree_disguise.png rename to graphics/field_effects/pics/tree_disguise.png diff --git a/graphics/object_events/pics/effects/unknown_16.png b/graphics/field_effects/pics/unknown_16.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_16.png rename to graphics/field_effects/pics/unknown_16.png diff --git a/graphics/object_events/pics/effects/unknown_17.png b/graphics/field_effects/pics/unknown_17.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_17.png rename to graphics/field_effects/pics/unknown_17.png diff --git a/graphics/object_events/pics/effects/unknown_18.png b/graphics/field_effects/pics/unknown_18.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_18.png rename to graphics/field_effects/pics/unknown_18.png diff --git a/graphics/object_events/pics/effects/unknown_19.png b/graphics/field_effects/pics/unknown_19.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_19.png rename to graphics/field_effects/pics/unknown_19.png diff --git a/graphics/object_events/pics/effects/unknown_20.png b/graphics/field_effects/pics/unknown_20.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_20.png rename to graphics/field_effects/pics/unknown_20.png diff --git a/graphics/object_events/pics/effects/unknown_29.png b/graphics/field_effects/pics/unknown_29.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_29.png rename to graphics/field_effects/pics/unknown_29.png diff --git a/graphics/object_events/pics/effects/unknown_35.png b/graphics/field_effects/pics/unknown_35.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_35.png rename to graphics/field_effects/pics/unknown_35.png diff --git a/graphics/object_events/pics/effects/unused_grass.png b/graphics/field_effects/pics/unused_grass.png similarity index 100% rename from graphics/object_events/pics/effects/unused_grass.png rename to graphics/field_effects/pics/unused_grass.png diff --git a/graphics/object_events/palettes/event_object_palette_00.pal b/graphics/object_events/palettes/00.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_00.pal rename to graphics/object_events/palettes/00.pal diff --git a/graphics/object_events/palettes/event_object_palette_01.pal b/graphics/object_events/palettes/01.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_01.pal rename to graphics/object_events/palettes/01.pal diff --git a/graphics/object_events/palettes/event_object_palette_02.pal b/graphics/object_events/palettes/02.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_02.pal rename to graphics/object_events/palettes/02.pal diff --git a/graphics/object_events/palettes/event_object_palette_03.pal b/graphics/object_events/palettes/03.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_03.pal rename to graphics/object_events/palettes/03.pal diff --git a/graphics/object_events/palettes/event_object_palette_04.pal b/graphics/object_events/palettes/04.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_04.pal rename to graphics/object_events/palettes/04.pal diff --git a/graphics/object_events/palettes/event_object_palette_05.pal b/graphics/object_events/palettes/05.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_05.pal rename to graphics/object_events/palettes/05.pal diff --git a/graphics/object_events/palettes/event_object_palette_06.pal b/graphics/object_events/palettes/06.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_06.pal rename to graphics/object_events/palettes/06.pal diff --git a/graphics/object_events/palettes/event_object_palette_07.pal b/graphics/object_events/palettes/07.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_07.pal rename to graphics/object_events/palettes/07.pal diff --git a/graphics/object_events/palettes/event_object_palette_08.pal b/graphics/object_events/palettes/08.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_08.pal rename to graphics/object_events/palettes/08.pal diff --git a/graphics/object_events/palettes/event_object_palette_09.pal b/graphics/object_events/palettes/09.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_09.pal rename to graphics/object_events/palettes/09.pal diff --git a/graphics/object_events/palettes/event_object_palette_10.pal b/graphics/object_events/palettes/10.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_10.pal rename to graphics/object_events/palettes/10.pal diff --git a/graphics/object_events/palettes/event_object_palette_11.pal b/graphics/object_events/palettes/11.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_11.pal rename to graphics/object_events/palettes/11.pal diff --git a/graphics/object_events/palettes/event_object_palette_12.pal b/graphics/object_events/palettes/12.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_12.pal rename to graphics/object_events/palettes/12.pal diff --git a/graphics/object_events/palettes/event_object_palette_13.pal b/graphics/object_events/palettes/13.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_13.pal rename to graphics/object_events/palettes/13.pal diff --git a/graphics/object_events/palettes/event_object_palette_14.pal b/graphics/object_events/palettes/14.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_14.pal rename to graphics/object_events/palettes/14.pal diff --git a/graphics/object_events/palettes/event_object_palette_15.pal b/graphics/object_events/palettes/15.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_15.pal rename to graphics/object_events/palettes/15.pal diff --git a/graphics/object_events/palettes/event_object_palette_16.pal b/graphics/object_events/palettes/16.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_16.pal rename to graphics/object_events/palettes/16.pal diff --git a/graphics/object_events/palettes/event_object_palette_17.pal b/graphics/object_events/palettes/17.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_17.pal rename to graphics/object_events/palettes/17.pal diff --git a/graphics/object_events/palettes/event_object_palette_18.pal b/graphics/object_events/palettes/18.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_18.pal rename to graphics/object_events/palettes/18.pal diff --git a/graphics/object_events/palettes/event_object_palette_19.pal b/graphics/object_events/palettes/19.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_19.pal rename to graphics/object_events/palettes/19.pal diff --git a/graphics/object_events/palettes/event_object_palette_20.pal b/graphics/object_events/palettes/20.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_20.pal rename to graphics/object_events/palettes/20.pal diff --git a/graphics/object_events/palettes/event_object_palette_21.pal b/graphics/object_events/palettes/21.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_21.pal rename to graphics/object_events/palettes/21.pal diff --git a/graphics/object_events/palettes/event_object_palette_22.pal b/graphics/object_events/palettes/22.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_22.pal rename to graphics/object_events/palettes/22.pal diff --git a/graphics/object_events/palettes/event_object_palette_23.pal b/graphics/object_events/palettes/23.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_23.pal rename to graphics/object_events/palettes/23.pal diff --git a/graphics/object_events/palettes/event_object_palette_24.pal b/graphics/object_events/palettes/24.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_24.pal rename to graphics/object_events/palettes/24.pal diff --git a/graphics/object_events/palettes/event_object_palette_25.pal b/graphics/object_events/palettes/25.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_25.pal rename to graphics/object_events/palettes/25.pal diff --git a/graphics/object_events/palettes/event_object_palette_26.pal b/graphics/object_events/palettes/26.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_26.pal rename to graphics/object_events/palettes/26.pal diff --git a/graphics/object_events/palettes/event_object_palette_27.pal b/graphics/object_events/palettes/27.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_27.pal rename to graphics/object_events/palettes/27.pal diff --git a/graphics/object_events/palettes/event_object_palette_28.pal b/graphics/object_events/palettes/28.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_28.pal rename to graphics/object_events/palettes/28.pal diff --git a/graphics/object_events/palettes/event_object_palette_29.pal b/graphics/object_events/palettes/29.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_29.pal rename to graphics/object_events/palettes/29.pal diff --git a/graphics/object_events/palettes/event_object_palette_30.pal b/graphics/object_events/palettes/30.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_30.pal rename to graphics/object_events/palettes/30.pal diff --git a/graphics/object_events/palettes/event_object_palette_31.pal b/graphics/object_events/palettes/31.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_31.pal rename to graphics/object_events/palettes/31.pal diff --git a/graphics/object_events/palettes/event_object_palette_32.pal b/graphics/object_events/palettes/32.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_32.pal rename to graphics/object_events/palettes/32.pal diff --git a/graphics/object_events/palettes/event_object_palette_33.pal b/graphics/object_events/palettes/33.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_33.pal rename to graphics/object_events/palettes/33.pal diff --git a/graphics/object_events/palettes/event_object_palette_34.pal b/graphics/object_events/palettes/34.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_34.pal rename to graphics/object_events/palettes/34.pal diff --git a/src/battle_transition.c b/src/battle_transition.c index bf1ced2f86..23182e976e 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -817,7 +817,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EBC = .callback = sub_8148380 }; -static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_10.gbapal"); +static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/field_effects/palettes/10.gbapal"); const struct SpritePalette gFieldEffectObjectPaletteInfo10 = { diff --git a/src/data/object_event/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h similarity index 100% rename from src/data/object_event/field_effect_object_template_pointers.h rename to src/data/field_effects/field_effect_object_template_pointers.h diff --git a/src/data/object_event/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h similarity index 100% rename from src/data/object_event/field_effect_objects.h rename to src/data/field_effects/field_effect_objects.h diff --git a/src/data/object_event/base_oam.h b/src/data/object_events/base_oam.h similarity index 100% rename from src/data/object_event/base_oam.h rename to src/data/object_events/base_oam.h diff --git a/src/data/object_event/berry_tree_graphics_tables.h b/src/data/object_events/berry_tree_graphics_tables.h similarity index 100% rename from src/data/object_event/berry_tree_graphics_tables.h rename to src/data/object_events/berry_tree_graphics_tables.h diff --git a/src/data/object_event/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h similarity index 100% rename from src/data/object_event/movement_action_func_tables.h rename to src/data/object_events/movement_action_func_tables.h diff --git a/src/data/object_event/movement_type_func_tables.h b/src/data/object_events/movement_type_func_tables.h similarity index 100% rename from src/data/object_event/movement_type_func_tables.h rename to src/data/object_events/movement_type_func_tables.h diff --git a/src/data/object_event/event_object_anims.h b/src/data/object_events/object_event_anims.h similarity index 100% rename from src/data/object_event/event_object_anims.h rename to src/data/object_events/object_event_anims.h diff --git a/src/data/object_event/event_object_graphics.h b/src/data/object_events/object_event_graphics.h similarity index 87% rename from src/data/object_event/event_object_graphics.h rename to src/data/object_events/object_event_graphics.h index 0629e8c465..769a6bb0a1 100755 --- a/src/data/object_event/event_object_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -1,9 +1,9 @@ const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/walking.4bpp"); const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/brendan/running.4bpp"); -const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_08.gbapal"); +const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/08.gbapal"); const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp"); const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp"); -const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_33.gbapal"); +const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/33.gbapal"); const u16 gObjectEventPaletteNull1[16] = {}; const u16 gObjectEventPaletteNull2[16] = {}; const u16 gObjectEventPaletteNull3[16] = {}; @@ -19,8 +19,8 @@ const u16 gObjectEventPaletteNull12[16] = {}; const u16 gObjectEventPaletteNull13[16] = {}; const u16 gObjectEventPaletteNull14[16] = {}; const u16 gObjectEventPaletteNull15[16] = {}; -const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_09.gbapal"); -const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_10.gbapal"); +const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/09.gbapal"); +const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal"); const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/brendan/field_move.4bpp"); const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/surfing.4bpp"); const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/mach_bike.4bpp"); @@ -31,14 +31,14 @@ const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/object_even const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/object_events/pics/people/may/decorating.4bpp"); const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/brendan/underwater.4bpp"); const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/may/underwater.4bpp"); -const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_11.gbapal"); +const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/walking.4bpp"); const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/object_events/pics/people/may/running.4bpp"); -const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_17.gbapal"); -const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_18.gbapal"); +const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/17.gbapal"); +const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/18.gbapal"); const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/walking.4bpp"); const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp"); -const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_34.gbapal"); +const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/34.gbapal"); const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/object_events/palettes/unused_palette.gbapal"); const u16 gObjectEventPaletteNull16[16] = {}; const u16 gObjectEventPaletteNull17[16] = {}; @@ -60,14 +60,14 @@ const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/object_events/pics const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/may/field_move.4bpp"); const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/object_events/pics/people/may/fishing.4bpp"); const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/object_events/pics/people/may/watering.4bpp"); -const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_00.gbapal"); -const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_01.gbapal"); -const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_02.gbapal"); -const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_03.gbapal"); -const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_04.gbapal"); -const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_05.gbapal"); -const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_06.gbapal"); -const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_07.gbapal"); +const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/object_events/palettes/00.gbapal"); +const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/01.gbapal"); +const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/02.gbapal"); +const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/03.gbapal"); +const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/04.gbapal"); +const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/05.gbapal"); +const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/06.gbapal"); +const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/07.gbapal"); const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/object_events/pics/people/ninja_boy.4bpp"); const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/object_events/pics/people/twin.4bpp"); const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/object_events/pics/people/boy_1.4bpp"); @@ -177,10 +177,10 @@ const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/object_events/pics/po const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_swimming.4bpp"); const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azurill.4bpp"); const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/object_events/pics/people/mom.4bpp"); -const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_22.gbapal"); -const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_23.gbapal"); -const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_24.gbapal"); -const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_25.gbapal"); +const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/object_events/palettes/22.gbapal"); +const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/23.gbapal"); +const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/24.gbapal"); +const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/25.gbapal"); const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_natu_doll.4bpp"); const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_magnemite_doll.4bpp"); const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_squirtle_doll.4bpp"); @@ -238,21 +238,21 @@ const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/object_events const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/object_events/pics/misc/mr_brineys_boat.4bpp"); const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/object_events/pics/misc/fossil.4bpp"); const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/object_events/pics/misc/submarine_shadow.4bpp"); -const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_26.gbapal"); +const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/object_events/palettes/26.gbapal"); const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/object_events/pics/misc/truck.4bpp"); -const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_14.gbapal"); +const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/14.gbapal"); const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/object_events/pics/pokemon/vigoroth.4bpp"); -const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_15.gbapal"); +const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/15.gbapal"); const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/object_events/pics/misc/birchs_bag.4bpp"); const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/enemy_zigzagoon.4bpp"); -const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_16.gbapal"); +const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/16.gbapal"); const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/object_events/pics/pokemon/poochyena.4bpp"); -const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_27.gbapal"); +const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/object_events/palettes/27.gbapal"); const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/misc/cable_car.4bpp"); -const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_20.gbapal"); +const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/object_events/pics/misc/ss_tidal.4bpp"); -const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_21.gbapal"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/object_events/pics/effects/berry_tree_growth_sparkle.4bpp"); +const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effects/pics/berry_tree_growth_sparkle.4bpp"); const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp"); const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp"); const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp"); @@ -285,52 +285,52 @@ const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/object_events/ const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lansat.4bpp"); const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/durin.4bpp"); const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/tamato.4bpp"); -const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/object_events/pics/effects/surf_blob.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/field_effects/pics/surf_blob.4bpp"); const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/object_events/pics/people/quinty_plump.4bpp"); -const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_12.gbapal"); -const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_13.gbapal"); -const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp"); -const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp"); -const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp"); -const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); +const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); +const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/13.gbapal"); +const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/field_effects/pics/shadow_small.4bpp"); +const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/field_effects/pics/shadow_medium.4bpp"); +const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_large.4bpp"); +const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_extra_large.4bpp"); const u32 filler_8368A08[0x48] = {}; -const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/object_events/pics/effects/cut_grass.4bpp"); -const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/object_events/pics/effects/cut_grass.4bpp"); -const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_06.gbapal"); -const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/object_events/pics/effects/ripple.4bpp"); -const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/object_events/pics/effects/ash.4bpp"); -const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/object_events/pics/effects/arrow.4bpp"); -const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_00.gbapal"); -const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_01.gbapal"); -const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/object_events/pics/effects/ground_impact_dust.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_tall_grass.4bpp"); -const u32 gUnusedGrass[] = INCBIN_U32("graphics/object_events/pics/effects/unused_grass.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_16.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_17.4bpp"); -const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_18.4bpp"); -const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/object_events/pics/effects/long_grass.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/tall_grass.4bpp"); -const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/object_events/pics/effects/short_grass.4bpp"); -const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/sand_footprints.4bpp"); -const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/deep_sand_footprints.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/object_events/pics/effects/bike_tire_tracks.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_19.4bpp"); -const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_29.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_big_splash.4bpp"); -const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/object_events/pics/effects/splash.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_small_splash.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_20.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/tree_disguise.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/mountain_disguise.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/object_events/pics/effects/sand_disguise_placeholder.4bpp"); -const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/object_events/pics/effects/hot_springs_water.4bpp"); -const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_02.gbapal"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/object_events/pics/effects/jump_out_of_ash.4bpp"); -const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/object_events/pics/effects/lavaridge_gym_warp.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/object_events/pics/effects/bubbles.4bpp"); -const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_35.4bpp"); -const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_03.gbapal"); -const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/object_events/pics/effects/bird.4bpp"); +const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effects/pics/cut_grass.4bpp"); +const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effects/pics/cut_grass.4bpp"); +const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effects/palettes/06.gbapal"); +const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/field_effects/pics/ripple.4bpp"); +const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/field_effects/pics/ash.4bpp"); +const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/field_effects/pics/arrow.4bpp"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/00.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/01.gbapal"); +const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/field_effects/pics/ground_impact_dust.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_tall_grass.4bpp"); +const u32 gUnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/field_effects/pics/unknown_17.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/field_effects/pics/unknown_18.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/field_effects/pics/long_grass.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/field_effects/pics/tall_grass.4bpp"); +const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/field_effects/pics/short_grass.4bpp"); +const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/field_effects/pics/sand_footprints.4bpp"); +const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/field_effects/pics/deep_sand_footprints.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/field_effects/pics/bike_tire_tracks.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/field_effects/pics/unknown_19.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/field_effects/pics/unknown_29.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_big_splash.4bpp"); +const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/field_effects/pics/splash.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_small_splash.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/field_effects/pics/unknown_20.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effects/pics/tree_disguise.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effects/pics/mountain_disguise.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/field_effects/pics/sand_disguise_placeholder.4bpp"); +const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effects/pics/hot_springs_water.4bpp"); +const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effects/palettes/02.gbapal"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/field_effects/pics/jump_out_of_ash.4bpp"); +const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/field_effects/pics/lavaridge_gym_warp.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/field_effects/pics/bubbles.4bpp"); +const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/field_effects/pics/unknown_35.4bpp"); +const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effects/palettes/03.gbapal"); +const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/field_effects/pics/bird.4bpp"); const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp"); const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/object_events/pics/people/scott.4bpp"); const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/object_events/pics/misc/statue.4bpp"); @@ -339,15 +339,15 @@ const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/object_events/pics/p const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/object_events/pics/people/mystery_event_deliveryman.4bpp"); const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/object_events/pics/people/union_room_attendant.4bpp"); const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/object_events/pics/misc/moving_box.4bpp"); -const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_19.gbapal"); +const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/object_events/pics/pokemon/sudowoodo.4bpp"); const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/object_events/pics/pokemon/mew.4bpp"); -const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_28.gbapal"); +const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/object_events/palettes/28.gbapal"); const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/object_events/pics/people/red.4bpp"); const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/object_events/pics/people/leaf.4bpp"); -const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_30.gbapal"); +const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/object_events/palettes/30.gbapal"); const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/object_events/pics/misc/birth_island_stone.4bpp"); -const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_29.gbapal"); +const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/object_events/palettes/29.gbapal"); const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys.4bpp"); const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/anabel.4bpp"); const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/tucker.4bpp"); @@ -357,6 +357,6 @@ const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/object_events/pics/peo const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/lucy.4bpp"); const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/brandon.4bpp"); const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/object_events/pics/pokemon/lugia.4bpp"); -const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_32.gbapal"); +const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/object_events/palettes/32.gbapal"); const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/object_events/pics/pokemon/ho_oh.4bpp"); -const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_31.gbapal"); +const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/object_events/palettes/31.gbapal"); diff --git a/src/data/object_event/event_object_graphics_info.h b/src/data/object_events/object_event_graphics_info.h similarity index 100% rename from src/data/object_event/event_object_graphics_info.h rename to src/data/object_events/object_event_graphics_info.h diff --git a/src/data/object_event/event_object_graphics_info_pointers.h b/src/data/object_events/object_event_graphics_info_pointers.h similarity index 100% rename from src/data/object_event/event_object_graphics_info_pointers.h rename to src/data/object_events/object_event_graphics_info_pointers.h diff --git a/src/data/object_event/event_object_pic_tables.h b/src/data/object_events/object_event_pic_tables.h similarity index 100% rename from src/data/object_event/event_object_pic_tables.h rename to src/data/object_events/object_event_pic_tables.h diff --git a/src/data/object_event/event_object_subsprites.h b/src/data/object_events/object_event_subsprites.h similarity index 100% rename from src/data/object_event/event_object_subsprites.h rename to src/data/object_events/object_event_subsprites.h diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 572db3352f..464e6acecd 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -140,7 +140,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_2, }; -#include "data/object_event/event_object_graphics.h" +#include "data/object_events/object_event_graphics.h" // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = @@ -433,13 +433,13 @@ const u8 gInitialMovementTypeFacingDirections[] = { #define OBJ_EVENT_PAL_TAG_34 0x1123 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF -#include "data/object_event/event_object_graphics_info_pointers.h" -#include "data/object_event/field_effect_object_template_pointers.h" -#include "data/object_event/event_object_pic_tables.h" -#include "data/object_event/event_object_anims.h" -#include "data/object_event/base_oam.h" -#include "data/object_event/event_object_subsprites.h" -#include "data/object_event/event_object_graphics_info.h" +#include "data/object_events/object_event_graphics_info_pointers.h" +#include "data/field_effects/field_effect_object_template_pointers.h" +#include "data/object_events/object_event_pic_tables.h" +#include "data/object_events/object_event_anims.h" +#include "data/object_events/base_oam.h" +#include "data/object_events/object_event_subsprites.h" +#include "data/object_events/object_event_graphics_info.h" const struct SpritePalette sObjectEventSpritePalettes[] = { {gObjectEventPalette0, OBJ_EVENT_PAL_TAG_0}, @@ -661,14 +661,14 @@ const u16 *const gObjectPaletteTagSets[] = { gObjectPaletteTags3, }; -#include "data/object_event/berry_tree_graphics_tables.h" -#include "data/object_event/field_effect_objects.h" +#include "data/object_events/berry_tree_graphics_tables.h" +#include "data/field_effects/field_effect_objects.h" const s16 gMovementDelaysMedium[] = {32, 64, 96, 128}; const s16 gMovementDelaysLong[] = {32, 64, 128, 192}; const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; -#include "data/object_event/movement_type_func_tables.h" +#include "data/object_events/movement_type_func_tables.h" const u8 gFaceDirectionAnimNums[] = { [DIR_NONE] = 0, @@ -1089,7 +1089,7 @@ const u8 gUnknown_0850DC3F[][4] = { {3, 4, 2, 1} }; -#include "data/object_event/movement_action_func_tables.h" +#include "data/object_events/movement_action_func_tables.h" // Code diff --git a/src/field_effect.c b/src/field_effect.c index b89000cc32..7195f3f4a3 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -245,12 +245,12 @@ const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp"); const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp"); const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal"); const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp"); -const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_04.gbapal"); +const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/field_effects/palettes/04.gbapal"); const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp"); const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp"); const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp"); const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp"); -const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_05.gbapal"); +const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/field_effects/palettes/05.gbapal"); // Graphics for the lights streaking past your Pokemon when it uses a field move. const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp"); diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 95c7123b3f..60d1ea0724 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -72,7 +72,7 @@ static const u8 gSpriteImage_858DB78[] = INCBIN_U8("graphics/unknown/858E588/4.4 static const u8 gUnusedEmptySpace_858DBF8[32] = {0}; -static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_07.gbapal"); +static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/field_effects/palettes/07.gbapal"); static const u8 gSpriteImage_858DC38[] = INCBIN_U8("graphics/unknown/858E5D8/0.4bpp"); static const u8 gSpriteImage_858DCB8[] = INCBIN_U8("graphics/unknown/858E5D8/1.4bpp"); static const u8 gSpriteImage_858DD38[] = INCBIN_U8("graphics/unknown/858E5D8/2.4bpp"); @@ -84,7 +84,7 @@ static const u8 gSpriteImage_858DFB8[] = INCBIN_U8("graphics/unknown/858E5B0/2.4 static const u8 gSpriteImage_858E038[] = INCBIN_U8("graphics/unknown/858E5B0/3.4bpp"); static const u8 gSpriteImage_858E0B8[] = INCBIN_U8("graphics/unknown/858E5B0/4.4bpp"); static const u8 gSpriteImage_858E138[] = INCBIN_U8("graphics/unknown/858E5B0/5.4bpp"); -static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_08.gbapal"); +static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/field_effects/palettes/08.gbapal"); static const u8 gSpriteImage_858E1D8[] = INCBIN_U8("graphics/unknown/858E674/0.4bpp"); static const u8 gSpriteImage_858E2D8[] = INCBIN_U8("graphics/unknown/858E674/1.4bpp"); static const u8 gSpriteImage_858E3D8[] = INCBIN_U8("graphics/unknown/858E674/2.4bpp"); @@ -285,7 +285,7 @@ static const struct SpriteTemplate gUnknown_0858E68C = .callback = SpriteCB_SandPillar_0, }; -// This uses one of the secret base palettes, so there is no "field_effect_object_palette_09.pal" file. +// This uses one of the secret base palettes, so there is no "graphics/field_effects/palettes/09.pal" file. const struct SpritePalette gFieldEffectObjectPaletteInfo9 = {gTilesetPalettes_SecretBase[5], 0x100E}; static const u8 gSpriteImage_858E6AC[] = INCBIN_U8("graphics/unknown/858E84C/0.4bpp"); From 6b966d20e5d3866117fc9f1c0616654f2dfc415e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 12 Feb 2020 18:07:13 -0600 Subject: [PATCH 13/13] Update spritesheet rules --- spritesheet_rules.mk | 59 ++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 23dd6fbcf3..83a68b8870 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -1,4 +1,5 @@ OBJEVENTGFXDIR := graphics/object_events/pics +FLDEFFGFXDIR := graphics/field_effects/pics $(OBJEVENTGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 @@ -575,89 +576,89 @@ $(OBJEVENTGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png -$(OBJEVENTGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/ash.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/ash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/bike_hop_big_splash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/bike_hop_small_splash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(OBJEVENTGFXDIR)/effects/bike_hop_tall_grass.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/bike_hop_tall_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(OBJEVENTGFXDIR)/effects/bike_tire_tracks.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/bike_tire_tracks.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/bubbles.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/effects/deep_sand_footprints.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/deep_sand_footprints.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/ground_impact_dust.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/ground_impact_dust.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(OBJEVENTGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/jump_out_of_ash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/long_grass.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/long_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/mountain_disguise.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/ripple.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/sand_disguise_placeholder.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/effects/sand_footprints.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/sand_footprints.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/short_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/surf_blob.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(OBJEVENTGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/tall_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/tree_disguise.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/effects/unknown_16.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/unknown_16.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/unknown_17.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/unknown_18.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/unknown_18.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/unknown_19.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/unknown_19.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/unknown_20.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/unknown_20.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/unknown_29.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/unknown_29.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(OBJEVENTGFXDIR)/effects/lavaridge_gym_warp.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/lavaridge_gym_warp.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/unknown_35.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/unknown_35.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/effects/unused_grass.4bpp: %.4bpp: %.png +$(FLDEFFGFXDIR)/unused_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2